diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 030e78f..15e7a40 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -930,7 +930,7 @@ void Room::UpdateGas()
                     CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size());
                     NotifyUiUpdate();
                 }
-                #if 0
+                #if 1
                 CombineTeam();
                 #endif
                 ShuaPlane();