diff --git a/code/game/turfs/simulated/water_vr.dm b/code/game/turfs/simulated/water_vr.dm
index c98f10fe19..ea16037cf7 100644
--- a/code/game/turfs/simulated/water_vr.dm
+++ b/code/game/turfs/simulated/water_vr.dm
@@ -1,8 +1,4 @@
-<<<<<<< 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