From 6f76a4c04f4524b2024124a1c591413e4bdc42f1 Mon Sep 17 00:00:00 2001
From: go38coz <go38coz@mytum.de>
Date: Sat, 6 Jun 2026 02:48:23 +0200
Subject: [PATCH] try to fix

---
 Game/Assets/Scripts/DropletMovement.cs | 4 ----
 1 file changed, 4 deletions(-)

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;