diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs
index 15561bc..f9a0d76 100644
--- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs
+++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs
@@ -6,16 +6,13 @@ public class dAerialFallingState : dAerialBaseState
 {
     bool shouldGlide;
     public override void EnterState(dAerialStateManager aSM, dAerialBaseState previousState){
-<<<<<<< HEAD
         if(previousState == aSM.JumpingState && aSM.jumpHeld){
             shouldGlide = true;
         }
         else{
             shouldGlide = false;
         }
-=======
         aSM.GetComponent<Animator>().SetBool("isFalling", true);
->>>>>>> animations4
     }
 
     public override void ExitState(dAerialStateManager aSM, dAerialBaseState nextState){