diff --git a/shared/resource/jsons/dic_zyz_mainTask.json b/shared/resource/jsons/dic_zyz_mainTask.json
index 29e49b43f..20265d1fd 100644
--- a/shared/resource/jsons/dic_zyz_mainTask.json
+++ b/shared/resource/jsons/dic_zyz_mainTask.json
@@ -27,11 +27,7 @@
         "id": 3,
         "mainTaskId": 3,
         "taskType": 41,
-<<<<<<< Updated upstream
-        "taskInfo": "奇遇10次",
-=======
         "taskInfo": "事件触发10次",
->>>>>>> Stashed changes
         "group": 1,
         "taskParam": "0&1&",
         "taskStage": 1,