diff --git a/code/game/turfs/simulated/water_vr.dm b/code/game/turfs/simulated/water_vr.dm
index 55d5e057c84..c98f10fe194 100644
--- a/code/game/turfs/simulated/water_vr.dm
+++ b/code/game/turfs/simulated/water_vr.dm
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 /turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas and such.
+=======
+/turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas.
+>>>>>>> fisherdomer
 	outdoors = FALSE
 
 /turf/simulated/floor/water/deep/indoors
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 6158f147eb6..a9c816b3be8 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -20845,8 +20845,8 @@
 /turf/simulated/floor/water/deep/indoors,
 /area/tether/surfacebase/fish_farm)
 "Ir" = (
-/turf/simulated/floor/reinforced,
 /obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
 /turf/simulated/shuttle/plating/carry,
 /area/shuttle/tether/surface)
 "IR" = (