diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 0a9f928..a545de7 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -902,9 +902,7 @@ void Room::UpdateGas()
                     CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size());
                     NotifyUiUpdate();
                 }
-                #if 1
                 CombineTeam();
-                #endif
                 ShuaPlane();
                 NotifyWxVoip();
                 InitAirDrop();