diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs
index f507559..86de56d 100644
--- a/Game/Assets/Scripts/DropletMovement.cs
+++ b/Game/Assets/Scripts/DropletMovement.cs
@@ -137,10 +137,6 @@ public class DropletMovement : MonoBehaviour
         }
 
         //enable collider --> not a trigger anymore
-<<<<<<< HEAD
-        rb.useGravity = true;
-        playerCollider.isTrigger = false;
-=======
         rb.gravityScale = 1;
         playerCollider.isTrigger = false;
         isDropping = false;