"update unresolved conflicts"

Assets/Scripts/Character/CharacterCondition.cs

@@ -9,7 +9,6 @@ public class CharacterCondition
     public event Action<int> OnChangeAmmunitionEvent;
 
     private int health;
-
     public int HealthPoints 
     { 
         get 

Assets/Scripts/Character/MovementController.cs

@@ -36,16 +36,6 @@ public class MovementController : MonoBehaviour
     {
         FlagDistance = (flag.transform.position - gameObject.transform.position).magnitude;
     }
-
-    public void MoveToPointById(int id)
-    {
-        if (!navPoints.ContainsKey(id))
-        {
-            Debug.LogWarning("PIDOR");
-            return;
-        }
-        goToNextNavPoint(navPoints[id]);
-    }
     
     public void MoveToRandomPoint()
     {