diff --git a/Assets/Resources/Enemies/1/Enemy1V1.prefab b/Assets/Resources/Enemies/1/Enemy1V1.prefab
index 5d08c6f..8372c60 100644
--- a/Assets/Resources/Enemies/1/Enemy1V1.prefab
+++ b/Assets/Resources/Enemies/1/Enemy1V1.prefab
@@ -254,12 +254,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-<<<<<<< Updated upstream
   maxHealth: 100
   damageTickDelay: 1
-=======
-  maxHealth: 1
->>>>>>> Stashed changes
   OnHealthZero:
     m_PersistentCalls:
       m_Calls: []
diff --git a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs
index 05fbbf8..a510a5f 100644
--- a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs
+++ b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs
@@ -17,15 +17,10 @@ public class EnemyAnimationHandler : MonoBehaviour
     }
     void EnemyDie()
     {
-<<<<<<< Updated upstream
         GetComponent<Collider2D>().enabled = false;
         GetComponent<NavMeshAgent>().enabled = false;
 
         StartCoroutine(AnimationDie());
-=======
-        if (!isDying)
-            StartCoroutine(AnimationDie());
->>>>>>> Stashed changes
     }
 
     IEnumerator AnimationDie()