diff --git a/DangerousD/Content/map.tmx b/DangerousD/Content/map.tmx
index 98f3653..9afca4d 100644
--- a/DangerousD/Content/map.tmx
+++ b/DangerousD/Content/map.tmx
@@ -66,13 +66,10 @@
    <point/>
   </object>
  </objectgroup>
-<<<<<<< HEAD
-=======
 <objectgroup id="2" name="Слой объектов 1" class="LivingEntities.Monsters.Slime">
   <object id="5" x="1" y="100">
    <point/>
   </object>
  </objectgroup>
->>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
 
 </map>
diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index 33327c7..1d75e73 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -205,7 +205,7 @@ namespace DangerousD.GameCore
                 case GameState.Lobby:
                     break;
                 case GameState.Game:
-                    GameManager.mapManager.LoadLevel("lvl");
+                    GameManager.mapManager.LoadLevel("map");
                     GameManager.FindBorders();
                     break;
                 case GameState.Death: