diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json
index 187571d08..07b17422a 100644
--- a/shared/resource/jsons/dic_zyz_hero.json
+++ b/shared/resource/jsons/dic_zyz_hero.json
@@ -2669,28 +2669,17 @@
     },
     {
         "heroId": 59,
-<<<<<<< Updated upstream
-        "spineName": "wangyue",
-        "rSpineName": "&",
-        "name": "童渊",
-        "face_id": "wangyue",
-=======
         "spineName": "tongyuan",
         "rSpineName": "&",
         "name": "童渊",
         "face_id": "tongyuan",
->>>>>>> Stashed changes
         "quality": 3,
         "initialStars": 3,
         "pieceCount": 100,
         "camp": 4,
         "area": 0,
         "cost": 0,
-<<<<<<< Updated upstream
-        "jobid": 1,
-=======
         "jobid": 6,
->>>>>>> Stashed changes
         "skill": 0,
         "pieceId": 21057,
         "hp": 100,
@@ -2723,8 +2712,6 @@
         "atkSpineEffect": "dunqi",
         "showinRecruit": "0&",
         "recruit": "0&"
-<<<<<<< Updated upstream
-=======
     },
     {
         "heroId": 60,
@@ -2817,7 +2804,6 @@
         "atkSpineEffect": "dunqi",
         "showinRecruit": "0&",
         "recruit": "0&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 301,