diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs
index 477e3e6..a6f314a 100644
--- a/Game/Assets/Scripts/DropletMovement.cs
+++ b/Game/Assets/Scripts/DropletMovement.cs
@@ -3,21 +3,20 @@ using UnityEngine;
 public class DropletMovement : MonoBehaviour
 {
     private Rigidbody2D rb;
+<<<<<<< HEAD
+=======
+    public float moveSpeed = 5f;
+    public float jumpingPower = 5f;
+    private Vector2 movement;
+    private Animator playerAnim; //for animation
+    private float xInput;
+>>>>>>> 3a4d5de (current correct code inshallah)
 
     public float moveSpeed = 5f;
     public float jumpingPower = 5f;
 
     private Vector2 movement;
 
-    private Animator playerAnim;
-    private float xInput;
-
-    private bool isGrounded = true;
-
-    [SerializeField] private float dashSpeed;
-    [SerializeField] private float dashDuration;
-    private float dashTime;
-
     void Start()
     {
         rb = GetComponent<Rigidbody2D>();