diff --git a/bin/json/game_heroupstory.json b/bin/json/game_heroupstory.json
index b65acbcda..a03ac1dc6 100644
--- a/bin/json/game_heroupstory.json
+++ b/bin/json/game_heroupstory.json
@@ -1,17 +1,11 @@
 [
   {
     "heroid": 25001,
-<<<<<<< HEAD
-    "opentime": "2023/8/14 0:00:00",
-    "newheroday": 2,
-    "reward": []
-=======
     "opentime": [
       0,
       0,
       0
     ],
     "newheroday": 2
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_heroupstorychapter.json b/bin/json/game_heroupstorychapter.json
index 8c306d410..2c0867758 100644
--- a/bin/json/game_heroupstorychapter.json
+++ b/bin/json/game_heroupstorychapter.json
@@ -3,11 +3,6 @@
     "key": 1,
     "hero": 25001,
     "chapter": 1001,
-<<<<<<< HEAD
-    "onlevel": 0,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 101,
     "levellink": [
       102
@@ -22,10 +17,7 @@
         "n": 3000
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -39,11 +31,6 @@
     "key": 2,
     "hero": 25001,
     "chapter": 1001,
-<<<<<<< HEAD
-    "onlevel": 1,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 102,
     "levellink": [
       101,
@@ -60,10 +47,7 @@
         "n": 3010
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -77,11 +61,6 @@
     "key": 3,
     "hero": 25001,
     "chapter": 1001,
-<<<<<<< HEAD
-    "onlevel": 2,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 103,
     "levellink": [
       102,
@@ -97,10 +76,7 @@
         "n": 3020
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -114,22 +90,12 @@
     "key": 4,
     "hero": 25001,
     "chapter": 1001,
-<<<<<<< HEAD
-    "onlevel": 3,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 104,
     "levellink": [
       102,
       103
     ],
     "leveltype": 4,
-<<<<<<< HEAD
-    "startstory": 0,
-    "battle": 0,
-    "reward": [],
-=======
     "startstory": 10254,
     "battle": 101,
     "reward": [
@@ -140,7 +106,6 @@
       }
     ],
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -154,11 +119,6 @@
     "key": 5,
     "hero": 25001,
     "chapter": 1001,
-<<<<<<< HEAD
-    "onlevel": 4,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 105,
     "levellink": [
       104
@@ -173,10 +133,7 @@
         "n": 3040
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -190,11 +147,6 @@
     "key": 6,
     "hero": 25001,
     "chapter": 1002,
-<<<<<<< HEAD
-    "onlevel": 5,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 101,
     "levellink": [
       102
@@ -209,10 +161,7 @@
         "n": 3050
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -226,11 +175,6 @@
     "key": 7,
     "hero": 25001,
     "chapter": 1002,
-<<<<<<< HEAD
-    "onlevel": 6,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 102,
     "levellink": [
       101,
@@ -247,10 +191,7 @@
         "n": 3060
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -264,11 +205,6 @@
     "key": 8,
     "hero": 25001,
     "chapter": 1002,
-<<<<<<< HEAD
-    "onlevel": 7,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 103,
     "levellink": [
       102,
@@ -284,10 +220,7 @@
         "n": 3070
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -301,22 +234,12 @@
     "key": 9,
     "hero": 25001,
     "chapter": 1002,
-<<<<<<< HEAD
-    "onlevel": 8,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 104,
     "levellink": [
       102,
       103
     ],
     "leveltype": 4,
-<<<<<<< HEAD
-    "startstory": 0,
-    "battle": 0,
-    "reward": [],
-=======
     "startstory": 10254,
     "battle": 101,
     "reward": [
@@ -327,7 +250,6 @@
       }
     ],
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -341,11 +263,6 @@
     "key": 10,
     "hero": 25001,
     "chapter": 1002,
-<<<<<<< HEAD
-    "onlevel": 9,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 105,
     "levellink": [
       104
@@ -360,10 +277,7 @@
         "n": 3090
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -377,11 +291,6 @@
     "key": 11,
     "hero": 25001,
     "chapter": 1003,
-<<<<<<< HEAD
-    "onlevel": 10,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 101,
     "levellink": [
       102
@@ -396,10 +305,7 @@
         "n": 3100
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -413,11 +319,6 @@
     "key": 12,
     "hero": 25001,
     "chapter": 1003,
-<<<<<<< HEAD
-    "onlevel": 11,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 102,
     "levellink": [
       101,
@@ -434,10 +335,7 @@
         "n": 3110
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -451,11 +349,6 @@
     "key": 13,
     "hero": 25001,
     "chapter": 1003,
-<<<<<<< HEAD
-    "onlevel": 12,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 103,
     "levellink": [
       102,
@@ -471,10 +364,7 @@
         "n": 3120
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -488,11 +378,6 @@
     "key": 14,
     "hero": 25001,
     "chapter": 1003,
-<<<<<<< HEAD
-    "onlevel": 13,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 104,
     "levellink": [
       102,
@@ -508,10 +393,7 @@
         "n": 3130
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -525,11 +407,6 @@
     "key": 15,
     "hero": 25001,
     "chapter": 1003,
-<<<<<<< HEAD
-    "onlevel": 14,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 105,
     "levellink": [
       104
@@ -544,10 +421,7 @@
         "n": 3140
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -561,11 +435,6 @@
     "key": 16,
     "hero": 25001,
     "chapter": 1004,
-<<<<<<< HEAD
-    "onlevel": 15,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 101,
     "levellink": [
       102
@@ -580,10 +449,7 @@
         "n": 3150
       }
     ],
-<<<<<<< HEAD
-=======
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
@@ -597,21 +463,11 @@
     "key": 17,
     "hero": 25001,
     "chapter": 1004,
-<<<<<<< HEAD
-    "onlevel": 16,
-    "onlevelstory": 0,
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "level": 102,
     "levellink": [
       101
     ],
     "leveltype": 4,
-<<<<<<< HEAD
-    "startstory": 0,
-    "battle": 0,
-    "reward": [],
-=======
     "startstory": 10254,
     "battle": 101,
     "reward": [
@@ -622,7 +478,6 @@
       }
     ],
     "clearance": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "txt": {
       "key": "",
       "text": ""
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 292dbb141..73b4db043 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -77,13 +77,8 @@
     "hide": 0,
     "destroy": 1,
     "progress": 1,
-<<<<<<< HEAD
-    "frontstoryid": 10241,
-    "afterstoryid": 10242,
-=======
     "frontstoryid": 0,
     "afterstoryid": 10241,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "maingroupName": {
       "key": "",
       "text": ""
@@ -520,17 +515,9 @@
     "Episodetype": 1,
     "openlevel": 1,
     "EditorStage": 0,
-<<<<<<< HEAD
-    "venturemodel": "",
-    "venturetype": 1,
-    "ventureavatar": [
-      "Person/44005/44005_q.prefab"
-    ],
-=======
     "venturemodel": "Person/44005/44005_q.prefab",
     "venturetype": 0,
     "ventureavatar": [],
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
@@ -619,28 +606,17 @@
       100106
     ],
     "previoustage": 0,
-<<<<<<< HEAD
-    "Episodetype": 3,
-=======
     "Episodetype": 7,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "openlevel": 1,
     "EditorStage": 0,
     "venturemodel": "Person/44005/44005_q.prefab",
     "venturetype": 0,
     "ventureavatar": [],
     "herocolor": 1,
-<<<<<<< HEAD
-    "heroimg": "zxgq_qp_icon_it",
-    "bubbletext": {
-      "key": "main_stage_bubbletext_7",
-      "text": "老父亲的责任心"
-=======
     "heroimg": "attr_diamond",
     "bubbletext": {
       "key": "main_stage_bubbletext_8",
       "text": "瓜哥找到了神秘碎片？"
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     },
     "animation": "",
     "hide": 0,
@@ -743,11 +719,7 @@
   {
     "id": 1100109,
     "chapterid": 11001,
-<<<<<<< HEAD
-    "group_id": 100109,
-=======
     "group_id": 100108,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "previous_group_id": [
       100107
     ],
@@ -759,11 +731,7 @@
     "venturetype": 0,
     "ventureavatar": [],
     "herocolor": 1,
-<<<<<<< HEAD
-    "heroimg": "zxgq_qp_icon_sq",
-=======
     "heroimg": "attr_diamond",
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "bubbletext": {
       "key": "main_stage_bubbletext_9",
       "text": "瓜哥找到了神秘碎片？"
@@ -772,11 +740,7 @@
     "hide": 0,
     "destroy": 1,
     "progress": 1,
-<<<<<<< HEAD
-    "frontstoryid": 10258,
-=======
     "frontstoryid": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -784,19 +748,11 @@
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_9",
-<<<<<<< HEAD
-      "text": "1-9"
-    },
-    "title": {
-      "key": "mainchapter_main_stage_title_9",
-      "text": "捡东西"
-=======
       "text": "1-s"
     },
     "title": {
       "key": "mainchapter_main_stage_title_9",
       "text": "小游戏"
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     },
     "desc": {
       "key": "mainchapter_main_stage_desc_9",
@@ -825,27 +781,14 @@
   {
     "id": 1100110,
     "chapterid": 11001,
-<<<<<<< HEAD
-    "group_id": 100110,
-    "previous_group_id": [
-      100107
-=======
     "group_id": 100109,
     "previous_group_id": [
       100108
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     ],
     "previoustage": 0,
     "Episodetype": 7,
     "openlevel": 1,
     "EditorStage": 0,
-<<<<<<< HEAD
-    "venturemodel": "Person/44005/44005_q.prefab",
-    "venturetype": 0,
-    "ventureavatar": [],
-    "herocolor": 1,
-    "heroimg": "zxgq_qp_icon_sq",
-=======
     "venturemodel": "",
     "venturetype": 1,
     "ventureavatar": [
@@ -853,7 +796,6 @@
     ],
     "herocolor": 1,
     "heroimg": "attr_diamond",
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "bubbletext": {
       "key": "main_stage_bubbletext_10",
       "text": "瓜哥找到了神秘碎片？"
@@ -862,11 +804,7 @@
     "hide": 0,
     "destroy": 1,
     "progress": 1,
-<<<<<<< HEAD
-    "frontstoryid": 10259,
-=======
     "frontstoryid": 0,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -874,19 +812,11 @@
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_10",
-<<<<<<< HEAD
-      "text": "1-10"
-    },
-    "title": {
-      "key": "mainchapter_main_stage_title_10",
-      "text": "捡东西"
-=======
       "text": "1-7"
     },
     "title": {
       "key": "mainchapter_main_stage_title_10",
       "text": "月光暴走"
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     },
     "desc": {
       "key": "mainchapter_main_stage_desc_10",
@@ -915,37 +845,17 @@
   {
     "id": 1100111,
     "chapterid": 11001,
-<<<<<<< HEAD
-    "group_id": 100111,
-    "previous_group_id": [
-      100110,
-      100108,
-      100109
-    ],
-    "previoustage": 0,
-    "Episodetype": 3,
-=======
     "group_id": 100110,
     "previous_group_id": [
       100109
     ],
     "previoustage": 0,
     "Episodetype": 1,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "openlevel": 1,
     "EditorStage": 0,
     "venturemodel": "",
     "venturetype": 1,
     "ventureavatar": [
-<<<<<<< HEAD
-      "Person/44005/44005_q.prefab"
-    ],
-    "herocolor": 1,
-    "heroimg": "zxgq_qp_icon_gth",
-    "bubbletext": {
-      "key": "main_stage_bubbletext_11",
-      "text": "瓜哥怎么带着这么多东西回来了"
-=======
       "Person/13002/13002_exhibition.prefab"
     ],
     "herocolor": 1,
@@ -953,17 +863,12 @@
     "bubbletext": {
       "key": "main_stage_bubbletext_11",
       "text": "跟着小伊去寻找月光原石吧~"
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     },
     "animation": "",
     "hide": 0,
     "destroy": 1,
     "progress": 1,
-<<<<<<< HEAD
-    "frontstoryid": 10260,
-=======
     "frontstoryid": 10256,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -971,11 +876,7 @@
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_11",
-<<<<<<< HEAD
-      "text": "1-11"
-=======
       "text": "1-x"
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     },
     "title": {
       "key": "mainchapter_main_stage_title_11",
@@ -1154,19 +1055,11 @@
     "challengeward": 0
   },
   {
-<<<<<<< HEAD
-    "id": 1100114,
-    "chapterid": 11001,
-    "group_id": 100114,
-    "previous_group_id": [
-      100113
-=======
     "id": 1100112,
     "chapterid": 11001,
     "group_id": 100111,
     "previous_group_id": [
       100110
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     ],
     "previoustage": 0,
     "Episodetype": 1,
@@ -1178,17 +1071,10 @@
       "Person/44005/44005_q.prefab"
     ],
     "herocolor": 1,
-<<<<<<< HEAD
-    "heroimg": "zxgq_qp_icon_wh",
-    "bubbletext": {
-      "key": "main_stage_bubbletext_14",
-      "text": "·············"
-=======
     "heroimg": "zxgq_js_13002",
     "bubbletext": {
       "key": "main_stage_bubbletext_12",
       "text": "小伊突然失控！？"
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     },
     "animation": "",
     "hide": 0,
@@ -1201,18 +1087,6 @@
       "text": ""
     },
     "mainlineName": {
-<<<<<<< HEAD
-      "key": "mainchapter_main_stage_mainlineName_14",
-      "text": "1-14"
-    },
-    "title": {
-      "key": "mainchapter_main_stage_title_14",
-      "text": "月光暴走"
-    },
-    "desc": {
-      "key": "mainchapter_main_stage_desc_14",
-      "text": "地洞山摇，猩猩出现！"
-=======
       "key": "mainchapter_main_stage_mainlineName_12",
       "text": "1-c"
     },
@@ -1223,7 +1097,6 @@
     "desc": {
       "key": "mainchapter_main_stage_desc_12",
       "text": "瓜哥一家受到月光原石的影响，彻底失控。"
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     },
     "exp": 0,
     "hero_exp": 300,
@@ -1283,75 +1156,11 @@
     "challengeward": 0
   },
   {
-<<<<<<< HEAD
-    "id": 1100115,
-    "chapterid": 11001,
-    "group_id": 100115,
-    "previous_group_id": [
-      100114
-    ],
-    "previoustage": 0,
-    "Episodetype": 3,
-    "openlevel": 1,
-    "EditorStage": 0,
-    "venturemodel": "",
-    "venturetype": 0,
-    "ventureavatar": [],
-    "herocolor": 0,
-    "heroimg": "zxgq_qp_icon_gth",
-    "bubbletext": {
-      "key": "main_stage_bubbletext_15",
-      "text": "这该死的大猩猩"
-    },
-    "animation": "",
-    "hide": 0,
-    "destroy": 1,
-    "progress": 1,
-    "frontstoryid": 10265,
-    "afterstoryid": 0,
-    "maingroupName": {
-      "key": "",
-      "text": ""
-    },
-    "mainlineName": {
-      "key": "mainchapter_main_stage_mainlineName_15",
-      "text": "1-15"
-    },
-    "title": {
-      "key": "mainchapter_main_stage_title_15",
-      "text": "对话开始捡装备"
-    },
-    "desc": {
-      "key": "mainchapter_main_stage_desc_15",
-      "text": "对话开始捡装备"
-    },
-    "exp": 0,
-    "hero_exp": 0,
-    "ps_consume": [],
-    "ps_mg": [],
-    "firstaward": [],
-    "lotteryward": 0,
-    "commonaward": [],
-    "BattleReadyID": 0,
-    "FormatList": [],
-    "star": [],
-    "star_type": [],
-    "star_value": [],
-    "challengeward": 0
-  },
-  {
-    "id": 1100116,
-=======
     "id": 1100113,
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     "chapterid": 11001,
     "group_id": 100116,
     "previous_group_id": [
-<<<<<<< HEAD
-      100115
-=======
       100111
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     ],
     "previoustage": 0,
     "Episodetype": 7,
diff --git a/sys/configure/structs/Game.HeroupstoryChapterData.go b/sys/configure/structs/Game.HeroupstoryChapterData.go
index a864f1c3c..d01e879c1 100644
--- a/sys/configure/structs/Game.HeroupstoryChapterData.go
+++ b/sys/configure/structs/Game.HeroupstoryChapterData.go
@@ -14,21 +14,14 @@ type GameHeroupstoryChapterData struct {
     Key int32
     Hero int32
     Chapter int32
-<<<<<<< HEAD
     Onlevel int32
     Onlevelstory int32
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     Level int32
     Levellink []int32
     Leveltype int32
     Startstory int32
     Battle int32
     Reward []*Gameatn
-<<<<<<< HEAD
-=======
-    Clearance int32
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     Txt string
     Circle string
     Qq int32
@@ -46,11 +39,8 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) }
-<<<<<<< HEAD
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevel"].(float64); !_ok_ { err = errors.New("onlevel error"); return }; _v.Onlevel = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevelstory"].(float64); !_ok_ { err = errors.New("onlevelstory error"); return }; _v.Onlevelstory = int32(_tempNum_) }
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
@@ -83,10 +73,6 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e
                 }
             }
 
-<<<<<<< HEAD
-=======
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["clearance"].(float64); !_ok_ { err = errors.New("clearance error"); return }; _v.Clearance = int32(_tempNum_) }
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; if _v.Circle, _ok_ = _buf["circle"].(string); !_ok_ { err = errors.New("circle error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["qq"].(float64); !_ok_ { err = errors.New("qq error"); return }; _v.Qq = int32(_tempNum_) }
diff --git a/sys/configure/structs/Game.HeroupstoryData.go b/sys/configure/structs/Game.HeroupstoryData.go
index c1c1110a0..aa4bf2f35 100644
--- a/sys/configure/structs/Game.HeroupstoryData.go
+++ b/sys/configure/structs/Game.HeroupstoryData.go
@@ -12,14 +12,9 @@ import "errors"
 
 type GameHeroupstoryData struct {
     Heroid int32
-<<<<<<< HEAD
     Opentime string
     Newheroday int32
     Reward []*Gameatn
-=======
-    Opentime []int32
-    Newheroday int32
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
 }
 
 const TypeId_GameHeroupstoryData = 2045922254
@@ -30,7 +25,6 @@ func (*GameHeroupstoryData) GetTypeId() int32 {
 
 func (_v *GameHeroupstoryData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroid"].(float64); !_ok_ { err = errors.New("heroid error"); return }; _v.Heroid = int32(_tempNum_) }
-<<<<<<< HEAD
     { var _ok_ bool; if _v.Opentime, _ok_ = _buf["opentime"].(string); !_ok_ { err = errors.New("opentime error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["newheroday"].(float64); !_ok_ { err = errors.New("newheroday error"); return }; _v.Newheroday = int32(_tempNum_) }
      {
@@ -47,23 +41,6 @@ func (_v *GameHeroupstoryData)Deserialize(_buf map[string]interface{}) (err erro
                 }
             }
 
-=======
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["opentime"].([]interface{}); !_ok_ { err = errors.New("opentime error"); return }
-
-                _v.Opentime = make([]int32, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ int32
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
-                    _v.Opentime = append(_v.Opentime, _list_v_)
-                }
-            }
-
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["newheroday"].(float64); !_ok_ { err = errors.New("newheroday error"); return }; _v.Newheroday = int32(_tempNum_) }
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     return
 }
 
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index f3af8c618..28868fb71 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -214,11 +214,8 @@ type Tables struct {
     StoneBattle *GameStoneBattle
     StoneStore *GameStoneStore
     StoneStory *GameStoneStory
-<<<<<<< HEAD
     StoneWeek *GameStoneWeek
     StoneTalent *GameStoneTalent
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     GameSummaryTab *GameGameSummaryTab
     GameSummary *GameGameSummary
     CompositeAll *GameCompositeAll
@@ -238,10 +235,6 @@ type Tables struct {
     Heroupstory *GameHeroupstory
     HeroupstoryChapter *GameHeroupstoryChapter
     HeroupstoryBattle *GameHeroupstoryBattle
-<<<<<<< HEAD
-=======
-    HDCelebration *GameHDCelebration
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1467,7 +1460,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.StoneStory, err = NewGameStoneStory(buf) ; err != nil {
         return nil, err
     }
-<<<<<<< HEAD
     if buf, err = loader("game_stoneweek") ; err != nil {
         return nil, err
     }
@@ -1480,8 +1472,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.StoneTalent, err = NewGameStoneTalent(buf) ; err != nil {
         return nil, err
     }
-=======
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     if buf, err = loader("game_gamesummarytab") ; err != nil {
         return nil, err
     }
@@ -1596,14 +1586,5 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.HeroupstoryBattle, err = NewGameHeroupstoryBattle(buf) ; err != nil {
         return nil, err
     }
-<<<<<<< HEAD
-=======
-    if buf, err = loader("game_hdcelebration") ; err != nil {
-        return nil, err
-    }
-    if tables.HDCelebration, err = NewGameHDCelebration(buf) ; err != nil {
-        return nil, err
-    }
->>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
     return tables, nil
 }