diff --git a/gmtk_2024/project.godot b/gmtk_2024/project.godot
index db2d6d4..084e149 100644
--- a/gmtk_2024/project.godot
+++ b/gmtk_2024/project.godot
@@ -56,11 +56,7 @@ clickR={
 2d_physics/layer_2="Enemies"
 2d_physics/layer_3="Player"
 2d_physics/layer_4="Goal"
-<<<<<<< HEAD
 2d_physics/layer_5="Pushable"
-=======
-2d_physics/layer_5="Interactions"
->>>>>>> dev
 
 [rendering]