diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index bc65d5c..64bbbce 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1379,11 +1379,9 @@ void Room::MatchTeam(Human* hum)
 
 void Room::CombineTeam()
 {
-    #if 0
     if (MetaMgr::Instance()->prebattle_combine_team) {
         return;
     }
-    #endif
     std::map<int, size_t> need_combine_teams;
     std::map<int, size_t> need_combine_teams_copy;