diff --git a/jd_redrain.js b/jd_redrain.js
index 7e04caa..5a2e317 100644
--- a/jd_redrain.js
+++ b/jd_redrain.js
@@ -177,17 +177,10 @@ function doInteractiveAssignment(encryptProjectId, encryptAssignmentId) {
         } else {
           if (safeGet(data)) {
             data = JSON.parse(data);
-<<<<<<< HEAD
             console.log(data);
             if (data.subCode == "0") {
               console.log(`${data.rewardsInfo.successRewards[3][0].quantity}京豆`);
               allMessage += `京东账号${$.index}${$.nickName || $.UserName}\n领取成功，获得【${data.rewardsInfo.successRewards[3][0].quantity}】京豆${$.index !== cookiesArr.length ? '\n\n' : ''}`;
-=======
-            if (data.subCode == "0") {
-              //console.log(`${data.rewardsInfo.successRewards[3][0].rewardName}`);
-              message += `领取成功，获得 ${data.rewardsInfo.successRewards[3][0].rewardName}`
-              allMessage += `京东账号${$.index}${$.nickName || $.UserName}\n领取成功，获得 ${data.rewardsInfo.successRewards[3][0].rewardName}${$.index !== cookiesArr.length ? '\n\n' : ''}`;
->>>>>>> 69e2454bc59e9c82e511b6f469b90a55e18e21fd
             } else {
               console.log(data);
             }