diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt
index c08eec07..cf39a554 100644
--- a/server/gameserver/CMakeLists.txt
+++ b/server/gameserver/CMakeLists.txt
@@ -16,12 +16,7 @@ message(LIB_DIR: ${LIB_DIR} )
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1")
 if (${ASAN})
-<<<<<<< HEAD
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEWBIE_ROOM=1 -fsanitize=address -fno-omit-frame-pointer")
-  set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DCXY -DSXY -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEWBIE_ROOM=1 -fsanitize=address -fno-omit-frame-pointer")
-=======
   set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -fsanitize=address -fno-omit-frame-pointer")
->>>>>>> mm2
 else()
   set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1")
 endif()
diff --git a/server/gameserver/mt/Map.h b/server/gameserver/mt/Map.h
index 55c29062..c40bad77 100644
--- a/server/gameserver/mt/Map.h
+++ b/server/gameserver/mt/Map.h
@@ -36,12 +36,9 @@ namespace mt
         std::vector<std::shared_ptr<WorldObject>> _world_objects;
         std::shared_ptr<MapCollider> collider_info;
         std::map<int, std::vector<std::shared_ptr<WorldObject>>> _group_world_objects;
-<<<<<<< HEAD
-=======
         MapCollider* collider_info = nullptr;
         std::vector<std::tuple<std::shared_ptr<WorldObject>, int>> moba_born_points;
         std::vector<std::vector<std::tuple<std::shared_ptr<WorldObject>, int>>> moba_path_points;
->>>>>>> mm2
 
         std::string RandTemplate() const;
         int GetCarLimit(int car_id) const;
diff --git a/server/gameserver/mt/MetaMgr.h b/server/gameserver/mt/MetaMgr.h
index 58606a64..7440c8e4 100644
--- a/server/gameserver/mt/MetaMgr.h
+++ b/server/gameserver/mt/MetaMgr.h
@@ -82,21 +82,7 @@ namespace mt
         template<class T>
         void RegMetaTable(const std::string& dir)
         {
-<<<<<<< HEAD
-            std::shared_ptr<mt::MetaTable> p = std::make_shared<mt::MetaTable>();
-            p->destory_cb =
-                [] ()
-                {
-                    for (T* item : T::raw_list) {
-                        delete item;
-                    }
-                    T::raw_list.clear();
-                    T::id_hash.clear();
-                    T::name_hash.clear();
-                };
-=======
             auto p = std::make_shared<mt::MetaTable>();
->>>>>>> mm2
             p->static_pre_init_cb =
                 [] ()
                 {
diff --git a/server/gameserver/mt/SkillNumber.cc b/server/gameserver/mt/SkillNumber.cc
index 65b51056..e0b9ae57 100644
--- a/server/gameserver/mt/SkillNumber.cc
+++ b/server/gameserver/mt/SkillNumber.cc
@@ -165,12 +165,8 @@ namespace mt
                 abort();
             }
 #ifdef DEBUG
-<<<<<<< HEAD
-            if (App::Instance()->GetInstanceId() == 6) {
-=======
             if (App::Instance()->instance_id == 600 ||
                 App::Instance()->instance_id == 100) {
->>>>>>> mm2
                 _float_cd = 6;
             }
 #endif
diff --git a/server/gameserver/mtb/Hero.h b/server/gameserver/mtb/Hero.h
index f4f625be..20e58d57 100644
--- a/server/gameserver/mtb/Hero.h
+++ b/server/gameserver/mtb/Hero.h
@@ -52,10 +52,7 @@ namespace mtb
     float defence_ratio() const { return defence_ratio_; };
     const std::string bt() const { return bt_; };
     const std::string drop() const { return drop_; };
-<<<<<<< HEAD
-=======
     const std::string new_bt() const { return new_bt_; };
->>>>>>> mm2
 
     bool has_id() const { return __flags__.test(0);};
     bool has_radius() const { return __flags__.test(1);};
diff --git a/server/gameserver/mtb/SafeArea.h b/server/gameserver/mtb/SafeArea.h
index 4e2e2d61..056e446d 100644
--- a/server/gameserver/mtb/SafeArea.h
+++ b/server/gameserver/mtb/SafeArea.h
@@ -20,10 +20,7 @@ namespace mtb
     int x1() const { return x1_; };
     int y1() const { return y1_; };
     const std::string boss() const { return boss_; };
-<<<<<<< HEAD
-=======
     int rebirth() const { return rebirth_; };
->>>>>>> mm2
 
     bool has_id() const { return __flags__.test(0);};
     bool has_level() const { return __flags__.test(1);};
diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc
index 549e28b8..75366fc7 100644
--- a/server/gameserver/mtb/mtb.all.cc
+++ b/server/gameserver/mtb/mtb.all.cc
@@ -71,11 +71,7 @@ namespace mtb
     {
       std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
       if (!meta_class) {
-<<<<<<< HEAD
-        meta_class = std::make_shared<a8::reflect::Class>("Map", 21, 0);
-=======
         meta_class = std::make_shared<a8::reflect::Class>("Map", 29, 0);
->>>>>>> mm2
         meta_class->SetSimpleField(0, "map_id", a8::reflect::ET_INT32, my_offsetof2(Map, map_id_));
         meta_class->SetSimpleField(1, "template_list", a8::reflect::ET_STRING, my_offsetof2(Map, template_list_));
         meta_class->SetSimpleField(2, "map_name", a8::reflect::ET_STRING, my_offsetof2(Map, map_name_));
@@ -174,11 +170,7 @@ namespace mtb
     {
       std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
       if (!meta_class) {
-<<<<<<< HEAD
-        meta_class = std::make_shared<a8::reflect::Class>("SafeArea", 10, 0);
-=======
         meta_class = std::make_shared<a8::reflect::Class>("SafeArea", 11, 0);
->>>>>>> mm2
         meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(SafeArea, id_));
         meta_class->SetSimpleField(1, "level", a8::reflect::ET_INT32, my_offsetof2(SafeArea, level_));
         meta_class->SetSimpleField(2, "rad", a8::reflect::ET_INT32, my_offsetof2(SafeArea, rad_));
@@ -194,12 +186,6 @@ namespace mtb
       return meta_class;
     }
 
-<<<<<<< HEAD
-    std::shared_ptr<a8::reflect::Class> SafeAreaPos::GetClass() const
-    {
-      std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
-      if (!meta_class) {
-=======
     std::shared_ptr<a8::reflect::Class> SafeAreaSafePoint::GetClass() const
     {
       std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
@@ -218,7 +204,6 @@ namespace mtb
     {
       std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
       if (!meta_class) {
->>>>>>> mm2
         meta_class = std::make_shared<a8::reflect::Class>("SafeAreaPos", 21, 0);
         meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(SafeAreaPos, id_));
         meta_class->SetSimpleField(1, "x1", a8::reflect::ET_INT32, my_offsetof2(SafeAreaPos, x1_));
@@ -342,11 +327,7 @@ namespace mtb
     {
       std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
       if (!meta_class) {
-<<<<<<< HEAD
-        meta_class = std::make_shared<a8::reflect::Class>("Hero", 42, 0);
-=======
         meta_class = std::make_shared<a8::reflect::Class>("Hero", 43, 0);
->>>>>>> mm2
         meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Hero, id_));
         meta_class->SetSimpleField(1, "radius", a8::reflect::ET_FLOAT, my_offsetof2(Hero, radius_));
         meta_class->SetSimpleField(2, "move_speed", a8::reflect::ET_FLOAT, my_offsetof2(Hero, move_speed_));
@@ -453,11 +434,7 @@ namespace mtb
     {
       std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
       if (!meta_class) {
-<<<<<<< HEAD
-        meta_class = std::make_shared<a8::reflect::Class>("SkillNumber", 21, 0);
-=======
         meta_class = std::make_shared<a8::reflect::Class>("SkillNumber", 27, 0);
->>>>>>> mm2
         meta_class->SetSimpleField(0, "skill_id", a8::reflect::ET_INT32, my_offsetof2(SkillNumber, skill_id_));
         meta_class->SetSimpleField(1, "skill_type", a8::reflect::ET_INT32, my_offsetof2(SkillNumber, skill_type_));
         meta_class->SetSimpleField(2, "number", a8::reflect::ET_FLOAT, my_offsetof2(SkillNumber, number_));
@@ -493,11 +470,7 @@ namespace mtb
     {
       std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
       if (!meta_class) {
-<<<<<<< HEAD
-        meta_class = std::make_shared<a8::reflect::Class>("NpcStandard", 5, 0);
-=======
         meta_class = std::make_shared<a8::reflect::Class>("NpcStandard", 7, 0);
->>>>>>> mm2
         meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(NpcStandard, id_));
         meta_class->SetSimpleField(1, "quality", a8::reflect::ET_INT32, my_offsetof2(NpcStandard, quality_));
         meta_class->SetSimpleField(2, "hp", a8::reflect::ET_INT32, my_offsetof2(NpcStandard, hp_));
@@ -513,11 +486,7 @@ namespace mtb
     {
       std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
       if (!meta_class) {
-<<<<<<< HEAD
-        meta_class = std::make_shared<a8::reflect::Class>("Buff", 36, 0);
-=======
         meta_class = std::make_shared<a8::reflect::Class>("Buff", 38, 0);
->>>>>>> mm2
         meta_class->SetSimpleField(0, "buff_id", a8::reflect::ET_INT32, my_offsetof2(Buff, buff_id_));
         meta_class->SetSimpleField(1, "name", a8::reflect::ET_STRING, my_offsetof2(Buff, name_));
         meta_class->SetSimpleField(2, "buff_target", a8::reflect::ET_INT32, my_offsetof2(Buff, buff_target_));
@@ -529,33 +498,6 @@ namespace mtb
         meta_class->SetSimpleField(8, "buff_param4", a8::reflect::ET_STRING, my_offsetof2(Buff, buff_param4_));
         meta_class->SetSimpleField(9, "buff_param5", a8::reflect::ET_STRING, my_offsetof2(Buff, buff_param5_));
         meta_class->SetSimpleField(10, "buff_param6", a8::reflect::ET_STRING, my_offsetof2(Buff, buff_param6_));
-<<<<<<< HEAD
-        meta_class->SetSimpleField(11, "duration_time", a8::reflect::ET_STRING, my_offsetof2(Buff, duration_time_));
-        meta_class->SetSimpleField(12, "buff_valueup", a8::reflect::ET_FLOAT, my_offsetof2(Buff, buff_valueup_));
-        meta_class->SetSimpleField(13, "immune_buffeffect_list", a8::reflect::ET_STRING, my_offsetof2(Buff, immune_buffeffect_list_));
-        meta_class->SetSimpleField(14, "post_remove_action", a8::reflect::ET_STRING, my_offsetof2(Buff, post_remove_action_));
-        meta_class->SetSimpleField(15, "only_server", a8::reflect::ET_INT32, my_offsetof2(Buff, only_server_));
-        meta_class->SetSimpleField(16, "only_self", a8::reflect::ET_INT32, my_offsetof2(Buff, only_self_));
-        meta_class->SetSimpleField(17, "depend_effect", a8::reflect::ET_INT32, my_offsetof2(Buff, depend_effect_));
-        meta_class->SetSimpleField(18, "child_buff", a8::reflect::ET_STRING, my_offsetof2(Buff, child_buff_));
-        meta_class->SetSimpleField(19, "coexist_num", a8::reflect::ET_INT32, my_offsetof2(Buff, coexist_num_));
-        meta_class->SetSimpleField(20, "dead_valid", a8::reflect::ET_INT32, my_offsetof2(Buff, dead_valid_));
-        meta_class->SetSimpleField(21, "buff_interval", a8::reflect::ET_STRING, my_offsetof2(Buff, buff_interval_));
-        meta_class->SetSimpleField(22, "tag", a8::reflect::ET_STRING, my_offsetof2(Buff, tag_));
-        meta_class->SetSimpleField(23, "post_battle_valid", a8::reflect::ET_INT32, my_offsetof2(Buff, post_battle_valid_));
-        meta_class->SetSimpleField(24, "only_spec_race", a8::reflect::ET_STRING, my_offsetof2(Buff, only_spec_race_));
-        meta_class->SetSimpleField(25, "exclude_spec_race", a8::reflect::ET_STRING, my_offsetof2(Buff, exclude_spec_race_));
-        meta_class->SetSimpleField(26, "dead_remove", a8::reflect::ET_INT32, my_offsetof2(Buff, dead_remove_));
-        meta_class->SetSimpleField(27, "no_immune", a8::reflect::ET_INT32, my_offsetof2(Buff, no_immune_));
-        meta_class->SetSimpleField(28, "lock_move", a8::reflect::ET_INT32, my_offsetof2(Buff, lock_move_));
-        meta_class->SetSimpleField(29, "lock_dir", a8::reflect::ET_INT32, my_offsetof2(Buff, lock_dir_));
-        meta_class->SetSimpleField(30, "lock_move_dir", a8::reflect::ET_INT32, my_offsetof2(Buff, lock_move_dir_));
-        meta_class->SetSimpleField(31, "disable_shot", a8::reflect::ET_INT32, my_offsetof2(Buff, disable_shot_));
-        meta_class->SetSimpleField(32, "disable_useskill", a8::reflect::ET_INT32, my_offsetof2(Buff, disable_useskill_));
-        meta_class->SetSimpleField(33, "effect_list", a8::reflect::ET_STRING, my_offsetof2(Buff, effect_list_));
-        meta_class->SetSimpleField(34, "res_scale", a8::reflect::ET_STRING, my_offsetof2(Buff, res_scale_));
-        meta_class->SetSimpleField(35, "tenacity", a8::reflect::ET_INT32, my_offsetof2(Buff, tenacity_));
-=======
         meta_class->SetSimpleField(11, "buff_param7", a8::reflect::ET_STRING, my_offsetof2(Buff, buff_param7_));
         meta_class->SetSimpleField(12, "buff_param8", a8::reflect::ET_STRING, my_offsetof2(Buff, buff_param8_));
         meta_class->SetSimpleField(13, "duration_time", a8::reflect::ET_STRING, my_offsetof2(Buff, duration_time_));
@@ -583,7 +525,6 @@ namespace mtb
         meta_class->SetSimpleField(35, "effect_list", a8::reflect::ET_STRING, my_offsetof2(Buff, effect_list_));
         meta_class->SetSimpleField(36, "res_scale", a8::reflect::ET_STRING, my_offsetof2(Buff, res_scale_));
         meta_class->SetSimpleField(37, "tenacity", a8::reflect::ET_INT32, my_offsetof2(Buff, tenacity_));
->>>>>>> mm2
       }
       return meta_class;
     }
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 6c726c27..51894cfd 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2380,15 +2380,9 @@ void Room::NotifyGameStart()
 
 long long Room::GetGasInactiveTime()
 {
-<<<<<<< HEAD
-#ifdef DEBUG
-    if (App::Instance()->GetInstanceId() == 2) {
-        return 30;
-=======
     long long inactive_time = 0;
     if (IsPveRoom()) {
         inactive_time = 10;
->>>>>>> mm2
     } else {
         if (IsPvpRankModeRoom()) {
             if (IsPvpMasterRankModeRoom()) {