diff --git a/src/de/steamwar/bungeecore/commands/FightCommand.java b/src/de/steamwar/bungeecore/commands/FightCommand.java
index aeeb8dcc..b71736fd 100644
--- a/src/de/steamwar/bungeecore/commands/FightCommand.java
+++ b/src/de/steamwar/bungeecore/commands/FightCommand.java
@@ -160,7 +160,11 @@ public class FightCommand extends BasicCommand {
         if(map == null)
             return;
 
-        callback.run(player, mode, map);
+        if(precommand.equals("/bau testarena ") || precommand.startsWith("/challenge ")) {
+            callback.run(player, mode, map);
+        } else if(suggestMerging(player, mode, map, callback)) {
+            callback.run(player, mode, map);
+        }
     }
 
     public static boolean suggestMerging(ProxiedPlayer player, ArenaMode mode, String map, FightCallback declineMerge) {