diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index f5d334e..62c57b8 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -208,14 +208,7 @@ 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: