diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index 73e9662..fd87e98 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -208,14 +208,12 @@ namespace DangerousD.GameCore
                 case GameState.Lobby:
                     break;
                 case GameState.Game:
-<<<<<<< HEAD
 
-                    GameManager.mapManager.LoadLevel("map");
 
                     
-=======
+
                     GameManager.mapManager.LoadLevel(currentMap);
->>>>>>> main
+
                     GameManager.FindBorders();
                     break;
                 case GameState.Death: