diff --git a/gmtk_2024/levels/level_1.tscn b/gmtk_2024/levels/level_1.tscn
index 8d6688f..826e255 100644
--- a/gmtk_2024/levels/level_1.tscn
+++ b/gmtk_2024/levels/level_1.tscn
@@ -6,11 +6,8 @@
 [ext_resource type="Texture2D" uid="uid://bki6ucvk6bjwk" path="res://textures/Level 01.png" id="5_4p03u"]
 [ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="6_xhax5"]
 [ext_resource type="PackedScene" uid="uid://cpa66thuxma15" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"]
-<<<<<<< HEAD
 [ext_resource type="PackedScene" uid="uid://d17jpcgayfg6i" path="res://objects/BoxPushable_1.tscn" id="8_o0q03"]
-=======
 [ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"]
->>>>>>> dev
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"]
 texture = ExtResource("2_wqskp")
@@ -170,11 +167,9 @@ position = Vector2(582, -317)
 [node name="MirrorOrb" parent="." index="8" instance=ExtResource("7_dyi0e")]
 position = Vector2(-431, -212)
 
-<<<<<<< HEAD
+
 [node name="BoxPushable1" parent="." index="13" instance=ExtResource("8_o0q03")]
 position = Vector2(-228, 320)
-=======
 [node name="Block" parent="." index="9" instance=ExtResource("8_ec71m")]
 position = Vector2(476, 253)
 collision_layer = 1
->>>>>>> dev