diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs
index fa84566..5b89e48 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs
@@ -12,12 +12,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class Slime : CoreEnemy
     {
-<<<<<<< HEAD
         private bool isGoRight = true;
         private bool isDown = true;
-=======
-        private bool isDown = false;
->>>>>>> main
         int leftBorder;
         int rightBorder;
         bool isAttaking = false;