diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index 21064a6c94..cb068e84e5 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -7811,36 +7811,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor,
 /area/storage/tech)
-<<<<<<< HEAD
-"ly" = (
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/item/weapon/circuitboard/transhuman_synthprinter{
-	pixel_x = -3;
-	pixel_y = 4
-	},
-/obj/item/weapon/circuitboard/rdconsole{
-	pixel_x = 0;
-	pixel_y = 2
-	},
-/obj/item/weapon/circuitboard/destructive_analyzer,
-/obj/item/weapon/circuitboard/protolathe{
-	pixel_x = 3;
-	pixel_y = -2
-	},
-/obj/item/weapon/circuitboard/rdserver{
-	pixel_x = 6;
-	pixel_y = -4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/storage/tech)
-||||||| parent of 990448b094... Merge pull request #9860 from Heroman3003/boradening
 "ly" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -7866,8 +7836,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/storage/tech)
-=======
->>>>>>> 990448b094... Merge pull request #9860 from Heroman3003/boradening
 "lz" = (
 /obj/item/weapon/stool,
 /turf/simulated/floor,
@@ -29067,13 +29035,7 @@ vE
 wm
 ws
 xj
-<<<<<<< HEAD
-xQ
-||||||| parent of 1030f26c08... Merge pull request #9904 from Heroman3003/la-coppera
-oH
-=======
 oG
->>>>>>> 1030f26c08... Merge pull request #9904 from Heroman3003/la-coppera
 vT
 aP
 aP