test

Game/Assets/Scripts/DamageHandler.cs

@@ -0,0 +1,17 @@
+using UnityEngine;
+
+public class DamageHandler : MonoBehaviour
+{
+	public 
+    // Start is called once before the first execution of Update after the MonoBehaviour is created
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Game/Assets/Scripts/DamageHandler.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2b3b9fc97a2d39d2d84c4be43a79247a

Game/Assets/Scripts/DropletMovement.cs

@@ -3,14 +3,11 @@ 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;