diff --git a/GameConfig/LocalizeConfig_CN.bytes b/GameConfig/LocalizeConfig_CN.bytes
index 572f0c0..e39a836 100644
--- a/GameConfig/LocalizeConfig_CN.bytes
+++ b/GameConfig/LocalizeConfig_CN.bytes
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 š[ChineseSimplifiedç®€ä½“ä¸­æ–‡ChineseTraditionalç¹�ä½“ä¸­æ–‡Englishè‹±æ–‡1ä¸€2äºŒ3ä¸‰4å››5äº”6å…­7ä¸ƒ8å…«9ä¹�10å��Loginç™»å½•
-=======
-šZChineseSimplifiedç®€ä½“ä¸­æ–‡ChineseTraditionalç¹�ä½“ä¸­æ–‡Englishè‹±æ–‡1ä¸€2äºŒ3ä¸‰4å››5äº”6å…­7ä¸ƒ8å…«9ä¹�10å��Loginç™»å½•
->>>>>>> facbca3383383be9e627d266dc58645a305f97fc
 MomentDay1	{0}å¤©å‰�
 MomentDay2è¿˜æœ‰{0}å¤©MomentHour1{0}å°�æ—¶å‰�MomentHour2è¿˜æœ‰{0}å°�æ—¶MomentMinutes1{0}åˆ†é’Ÿå‰�MomentMinutes2è¿˜æœ‰{0}åˆ†é’ŸMomentSeconds1åˆšåˆšMomentSeconds2
 1åˆ†ä»¥å†…TuijianæŽ¨è��Jueseè§’è‰²
diff --git a/GameConfig/LocalizeConfig_EN.bytes b/GameConfig/LocalizeConfig_EN.bytes
index 17528fb..836d4b2 100644
--- a/GameConfig/LocalizeConfig_EN.bytes
+++ b/GameConfig/LocalizeConfig_EN.bytes
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 š[ChineseSimplifiedSimplified ChineseChineseTraditionaltraditional ChineseEnglishEnglish1one2two3three4Four5five6six7seven8Eight9Nine10tenLoginLog in
-=======
-šZChineseSimplifiedSimplified ChineseChineseTraditionaltraditional ChineseEnglishEnglish1one2two3three4Four5five6six7seven8Eight9Nine10tenLoginLog in
->>>>>>> facbca3383383be9e627d266dc58645a305f97fc
 MomentDay1{0} days ago
 MomentDay2
{0} days leftMomentHour1
{0} hours agoMomentHour2{0} hours leftMomentMinutes1{0} minutes agoMomentMinutes2{0} minutes leftMomentSeconds1justMomentSeconds2within 1 minuteTuijian	recommendJueseRole
 hero_13001Blinky
@@ -250,11 +246,7 @@ hero_10008RESIST
 hero_10009Grow Up Health
 hero_10010Grow Up Defend
 hero_10011Grow Up Attack
-<<<<<<< HEAD
 hero_10012	SuckBloodCritCritHpHealthDefDefendAtkAttackHpProGrow Up HealthDefProGrow Up DefendAtkProGrow Up Attackstar_2Rstar_3SRstar_4SSRstar_5URcolor_1Ncolor_2Rcolor_3SRcolor_4SSRcolor_5URcolor_6SPrace_1searingrace_2surgerace_3	whistlingrace_4shinejob_1attackjob_2defensejob_3	Auxiliaryjob_4controljob_5Materialitemdesc_10001$Heroes can be strengthened after useitemdesc_10002Dstone for testing functionality, it may be an unusable activity itemitemdesc_10003#Collect all 50 fragments to make Poitemdesc_10004-You can choose any one of the following itemsitemdesc_10005.You can get 1 of the following items at randomitemdesc_10006Open to get gold coinsitemdesc_10007#Get 2 hours of gold coins after useitemdesc_10008FGain 2 hours of gold after use, but he will disappear within 2 minutesitemdesc_10009VThis magic book is sealed by powerful magic, it can be opened after passing level 9999itemdesc_10010nIt seems to be the currency of a lost civilization, for the time being, it has only commemorative significanceitemdesc_10011/The hands don't move, maybe someone can fix it.itemdesc_10012 Delicate wood with a light aromaitemdesc_10013.Carrying it in a backpack will bring good luckitemdesc_10014NYou are an adventurer when you log in to the game, and you will get this medalitemdesc_10015luckier than cloveritemdesc_10016FDiamonds are man-made, so they cannot be used to buy items in the mallitemdesc_200012Collect 50 fragments to synthesize random guardianitemdesc_20002-Collect 50 fragments to synthesize hero 25001itemdesc_300018Can be used for general recruitment and hero recruitmentitemdesc_30002'Can be used to recruit heroes in camp 1itemdesc_30003(Can be used to recruit heroes for camp 2itemdesc_30004'Can be used to recruit heroes in camp 3itemdesc_30005'Can be used to recruit heroes in camp 4itemdesc_500014Putting it in your backpack will bring you good luckitemdesc_50002MIf you log in to the game, you are an adventurer, and you will get this medalitemdesc_50003Luckier than lucky grassitemdesc_50004KDiamonds are man-made, so they can't be used to buy commodities in the mallitemdesc_500054Putting it in your backpack will bring you good luckitemdesc_50006MIf you log in to the game, you are an adventurer, and you will get this medalitemdesc_50007Luckier than lucky grassitemdesc_50008KDiamonds are man-made, so they can't be used to buy commodities in the mallitemdesc_500094Putting it in your backpack will bring you good luckitemdesc_50010MIf you log in to the game, you are an adventurer, and you will get this medalitemdesc_50011Luckier than lucky grassitemdesc_50012KDiamonds are man-made, so they can't be used to buy commodities in the mallitemdesc_60001#You can choose any 5-star equipmentitemdesc_60002*You can obtain a 5-star equipment randomlyitemdesc_60003(You can obtain a set of 5-star equipmentitemname_10001Junior Kung Fu scrollitemname_10002Stoneitemname_100035 Star Po Sharditemname_10004Gold Choice Boxitemname_10005Random Gold Boxitemname_10006
gold coin boxitemname_100072Hour coinsitemname_100082Hour coinsitemname_10009sealed magic bookitemname_10010
ancient coinsitemname_10011broken clockitemname_10012wooditemname_10013four-leaf cloveritemname_10014Adventurer's Medalitemname_10015cat cat amuletitemname_10016artificial diamonditemname_20001Random hero fragmentitemname_20002Fragment 25001itemname_30001time gemitemname_30002	Camp1 gemitemname_30003	Camp2 gemitemname_30004	Camp3 gemitemname_30005	Camp4 gemitemname_50001ArcaneFood lv1itemname_50002TechnologyFood lv1itemname_50003NaturaFood lv1itemname_50004
LightFood lv1itemname_50005ArcaneFood lv2itemname_50006TechnologyFood lv2itemname_50007NaturaFood lv2itemname_50008
LightFood lv2itemname_50009ArcaneFood lv3itemname_50010TechnologyFood lv3itemname_50011NaturaFood lv3itemname_50012
LightFood lv3itemname_60001lv5 equi optional boxitemname_60002lv5 equi rand boxitemname_60003lv5 suit boxserver_10001local test serverserver_10006Raven Ridgeserver_10003Peace Valleyserver_10004Phoenix cityserver_10005Emerald Palaceskillname_190011000Captain Po's skillsskillname_190012000
-=======
-hero_10012	SuckBloodCritCritHpHealthDefDefendAtkAttackHpProGrow Up HealthDefProGrow Up DefendAtkProGrow Up Attackstar_2Rstar_3SRstar_4SSRstar_5URcolor_1Ncolor_2Rcolor_3SRcolor_4SSRcolor_5SPcolor_6URrace_1searingrace_2surgerace_3	whistlingrace_4shinejob_1attackjob_2defensejob_3	Auxiliaryjob_4controljob_5Materialitemdesc_10001$Heroes can be strengthened after useitemdesc_10002Dstone for testing functionality, it may be an unusable activity itemitemdesc_10003#Collect all 50 fragments to make Poitemdesc_10004-You can choose any one of the following itemsitemdesc_10005.You can get 1 of the following items at randomitemdesc_10006Open to get gold coinsitemdesc_10007#Get 2 hours of gold coins after useitemdesc_10008FGain 2 hours of gold after use, but he will disappear within 2 minutesitemdesc_10009VThis magic book is sealed by powerful magic, it can be opened after passing level 9999itemdesc_10010nIt seems to be the currency of a lost civilization, for the time being, it has only commemorative significanceitemdesc_10011/The hands don't move, maybe someone can fix it.itemdesc_10012 Delicate wood with a light aromaitemdesc_10013.Carrying it in a backpack will bring good luckitemdesc_10014NYou are an adventurer when you log in to the game, and you will get this medalitemdesc_10015luckier than cloveritemdesc_10016FDiamonds are man-made, so they cannot be used to buy items in the mallitemdesc_200012Collect 50 fragments to synthesize random guardianitemdesc_20002-Collect 50 fragments to synthesize hero 25001itemdesc_300018Can be used for general recruitment and hero recruitmentitemdesc_30002'Can be used to recruit heroes in camp 1itemdesc_30003(Can be used to recruit heroes for camp 2itemdesc_30004'Can be used to recruit heroes in camp 3itemdesc_30005'Can be used to recruit heroes in camp 4itemdesc_500014Putting it in your backpack will bring you good luckitemdesc_50002MIf you log in to the game, you are an adventurer, and you will get this medalitemdesc_50003Luckier than lucky grassitemdesc_50004KDiamonds are man-made, so they can't be used to buy commodities in the mallitemdesc_500054Putting it in your backpack will bring you good luckitemdesc_50006MIf you log in to the game, you are an adventurer, and you will get this medalitemdesc_50007Luckier than lucky grassitemdesc_50008KDiamonds are man-made, so they can't be used to buy commodities in the mallitemdesc_500094Putting it in your backpack will bring you good luckitemdesc_50010MIf you log in to the game, you are an adventurer, and you will get this medalitemdesc_50011Luckier than lucky grassitemdesc_50012KDiamonds are man-made, so they can't be used to buy commodities in the mallitemdesc_60001#You can choose any 5-star equipmentitemdesc_60002*You can obtain a 5-star equipment randomlyitemdesc_60003(You can obtain a set of 5-star equipmentitemname_10001Junior Kung Fu scrollitemname_10002Stoneitemname_100035 Star Po Sharditemname_10004Gold Choice Boxitemname_10005Random Gold Boxitemname_10006
gold coin boxitemname_100072Hour coinsitemname_100082Hour coinsitemname_10009sealed magic bookitemname_10010
ancient coinsitemname_10011broken clockitemname_10012wooditemname_10013four-leaf cloveritemname_10014Adventurer's Medalitemname_10015cat cat amuletitemname_10016artificial diamonditemname_20001Random hero fragmentitemname_20002Fragment 25001itemname_30001time gemitemname_30002	Camp1 gemitemname_30003	Camp2 gemitemname_30004	Camp3 gemitemname_30005	Camp4 gemitemname_50001ArcaneFood lv1itemname_50002TechnologyFood lv1itemname_50003NaturaFood lv1itemname_50004
LightFood lv1itemname_50005ArcaneFood lv2itemname_50006TechnologyFood lv2itemname_50007NaturaFood lv2itemname_50008
LightFood lv2itemname_50009ArcaneFood lv3itemname_50010TechnologyFood lv3itemname_50011NaturaFood lv3itemname_50012
LightFood lv3itemname_60001lv5 equi optional boxitemname_60002lv5 equi rand boxitemname_60003lv5 suit boxserver_10001local test serverserver_10006Raven Ridgeserver_10003Peace Valleyserver_10004Phoenix cityserver_10005Emerald Palaceskillname_190011000Captain Po's skillsskillname_190012000
->>>>>>> facbca3383383be9e627d266dc58645a305f97fc
 panda fistskillname_190013000Tai Chi Formskillname_190011003Tai Chi Zeroskillname_190014000Bobby's Captain Skillskillname_190016000Harmonyskillname_190017000dance of joyskillname_190018000rainbow note
 ComingSoonComing Soon
 NotYetOpenNot Yet Open	tips_1003ZThe current planet capacity is overloaded, please change the planet to start the adventure	tips_1004=The world is currently under construction, please enter later	tips_1005Reinforcement failure	tips_1006VHeroes who wear equipment will be removed if they are used as materials. Are you sure?	tips_1007PThe current equipment has been worn by other heroes. Are you sure to replace it?nonactivatedinactivated	activated	activatedopencond_prompt_10001Clearance 2-26 openopencond_prompt_10002Not open for now, stay tunedopencond_prompt_10003JOpen the server on the 2nd day and open after 2-14 after customs clearancenum_1001	ADVENTUREnum_1002SUMMONnum_1003STORYnum_1004KUNG FUnum_1005FESTIVALnum_1006MistyIslandnum_1007
diff --git a/GameConfig/game_drawcard.bytes b/GameConfig/game_drawcard.bytes
index 7be0f9b..0430f08 100644
--- a/GameConfig/game_drawcard.bytes
+++ b/GameConfig/game_drawcard.bytes
@@ -1,5 +1,4 @@
 r
-<<<<<<< HEAD
 base_pool114005ƒè
 base_pool114005ƒè
 base_pool114005ƒè
@@ -9,17 +8,6 @@ base_pool225001
 base_pool324005ƒè
 base_pool324005ƒè	
 base_pool324005ƒè
-=======
-base_pool144006ƒè
-base_pool144006ƒè
-base_pool144006ƒè
-base_pool245001ƒè
-base_pool245001ƒè
-base_pool245001ƒè
-base_pool344005ƒè
-base_pool344005ƒè	
-base_pool344005ƒè
->>>>>>> facbca3383383be9e627d266dc58645a305f97fc
 
 base_pool424004ƒè
 base_pool424004ƒè
