diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn
index 7023d71..8974311 100644
--- a/godot/assets/meat_creek/side_tunnel_1.tscn
+++ b/godot/assets/meat_creek/side_tunnel_1.tscn
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-[gd_scene load_steps=22 format=2]
-=======
-[gd_scene load_steps=23 format=2]
->>>>>>> 728f37803be883280645c24c9f0a6e2637a27012
+[gd_scene load_steps=24 format=2]
 
 [ext_resource path="res://assets/meat_creek/side_tunnel_1.glb" type="PackedScene" id=1]
 [ext_resource path="res://player/player.tscn" type="PackedScene" id=2]
@@ -22,12 +18,9 @@
 [ext_resource path="res://assets/audio/walkie_talkie/buzz_static.ogg" type="AudioStream" id=16]
 [ext_resource path="res://assets/audio/walkie_talkie/low_whale_one.ogg" type="AudioStream" id=17]
 [ext_resource path="res://assets/meat_creek/WhaleSounds.gd" type="Script" id=18]
-<<<<<<< HEAD
-[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=19]
-=======
 [ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=19]
 [ext_resource path="res://assets/models/obelisk/obelisk.tscn" type="PackedScene" id=20]
->>>>>>> 728f37803be883280645c24c9f0a6e2637a27012
+[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=400]
 
 [sub_resource type="PanoramaSky" id=2]
 panorama = ExtResource( 4 )
@@ -140,13 +133,13 @@ transform = Transform( 0.65383, 0, 0.756641, 0, 1, 0, -0.756641, 0, 0.65383, 18.
 
 [node name="decorations" type="Spatial" parent="." index="6"]
 
-[node name="meat_tentacle" parent="decorations" index="0" instance=ExtResource( 19 )]
+[node name="meat_tentacle" parent="decorations" index="0" instance=ExtResource( 400 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -62.359, 0.919437, -94.0659 )
 
-[node name="meat_tentacle2" parent="decorations" index="1" instance=ExtResource( 19 )]
+[node name="meat_tentacle2" parent="decorations" index="1" instance=ExtResource( 400 )]
 transform = Transform( 0.709009, -0.431706, -0.557617, 0.357585, 0.711878, -0.0964662, 0.700344, -0.209177, 1.05243, -63.2874, 0.919437, -93.3404 )
 
-[node name="meat_tentacle3" parent="decorations" index="2" instance=ExtResource( 19 )]
+[node name="meat_tentacle3" parent="decorations" index="2" instance=ExtResource( 400 )]
 transform = Transform( -0.0265356, -0.362184, -1.17042, 0, 1.26435, -0.335417, 1.29597, -0.00741591, -0.023965, -62.359, 0.919437, -93.1787 )
 
 [node name="shader" parent="." index="7" instance=ExtResource( 7 )]
@@ -165,7 +158,29 @@ max_distance = 200.0
 [node name="upper_shelf" parent="." index="11" instance=ExtResource( 13 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.09789, 0 )
 
-[node name="AmbientSounds" type="Node" parent="." index="12"]
+[node name="black_box0" parent="." index="12" instance=ExtResource( 19 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -41.0261, 1.80736, -111.427 )
+
+[node name="black_box1" parent="." index="13" instance=ExtResource( 19 )]
+transform = Transform( -0.222825, 0, 0.974859, 0, 1, 0, -0.974859, 0, -0.222825, -35.7068, 1.76987, -64.4388 )
+id = 1
+
+[node name="black_box2" parent="." index="14" instance=ExtResource( 19 )]
+transform = Transform( 0.473566, 0, -0.880759, 0, 1, 0, 0.880759, 0, 0.473566, 44.7662, 0.822734, -12.0992 )
+id = 2
+
+[node name="black_box3" parent="." index="15" instance=ExtResource( 19 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35.0576, 3.21833, 30.1744 )
+id = 3
+
+[node name="black_box4" parent="." index="16" instance=ExtResource( 19 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.60433, -122.797, -43.5648 )
+id = 4
+
+[node name="obelisk" parent="." index="17" instance=ExtResource( 20 )]
+transform = Transform( -0.0547934, 0, 0.998498, 0, 1, 0, -0.998498, 0, -0.0547934, 66.6986, 6.79926, -61.306 )
+
+[node name="AmbientSounds" type="Node" parent="." index="18"]
 
 [node name="WaterSound" type="AudioStreamPlayer" parent="AmbientSounds" index="0"]
 stream = ExtResource( 14 )
@@ -190,28 +205,6 @@ max_wait = 30.0
 [node name="Timer" type="Timer" parent="AmbientSounds/BottomWhale2" index="0"]
 one_shot = true
 
-[node name="black_box0" parent="." index="12" instance=ExtResource( 19 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -41.0261, 1.80736, -111.427 )
-
-[node name="black_box1" parent="." index="13" instance=ExtResource( 19 )]
-transform = Transform( -0.222825, 0, 0.974859, 0, 1, 0, -0.974859, 0, -0.222825, -35.7068, 1.76987, -64.4388 )
-id = 1
-
-[node name="black_box2" parent="." index="14" instance=ExtResource( 19 )]
-transform = Transform( 0.473566, 0, -0.880759, 0, 1, 0, 0.880759, 0, 0.473566, 44.7662, 0.822734, -12.0992 )
-id = 2
-
-[node name="black_box3" parent="." index="15" instance=ExtResource( 19 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35.0576, 3.21833, 30.1744 )
-id = 3
-
-[node name="black_box4" parent="." index="16" instance=ExtResource( 19 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.60433, -122.797, -43.5648 )
-id = 4
-
-[node name="obelisk" parent="." index="17" instance=ExtResource( 20 )]
-transform = Transform( -0.0547934, 0, 0.998498, 0, 1, 0, -0.998498, 0, -0.0547934, 66.6986, 6.79926, -61.306 )
-
 [connection signal="finished" from="AmbientSounds/BottomWhale1" to="AmbientSounds/BottomWhale1" method="_on_sound_finished"]
 [connection signal="timeout" from="AmbientSounds/BottomWhale1/Timer" to="AmbientSounds/BottomWhale1" method="_on_Timer_timeout"]
 [connection signal="finished" from="AmbientSounds/BottomWhale2" to="AmbientSounds/BottomWhale2" method="_on_sound_finished"]
diff --git a/godot/assets/models/black_box/Slime.material b/godot/assets/models/black_box/Slime.material
index 61e3f4d..9cf0a74 100644
--- a/godot/assets/models/black_box/Slime.material
+++ b/godot/assets/models/black_box/Slime.material
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4772f0f2c94355b2fa8ad02ce1aa9b2930919b7c85344f8e91a4f440f4851fd8
-size 67110843
+oid sha256:61f3523e0beacc6808cf7710dfc2230475aa8e2710ec1ece5f83653c0d126690
+size 11622571