diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 16253d3b599..11b273c3821 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -18188,16 +18188,6 @@
 	dir = 4
 	},
 /obj/structure/table/woodentable,
-/obj/machinery/librarycomp,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/table/woodentable,
 /obj/machinery/librarywikicomp,
 /turf/simulated/floor/wood,
 /area/library)
diff --git a/tools/StrongDMM/.StrongDMM.exe.old b/tools/StrongDMM/.StrongDMM.exe.old
new file mode 100644
index 00000000000..b499c8d2f9c
Binary files /dev/null and b/tools/StrongDMM/.StrongDMM.exe.old differ
diff --git a/tools/StrongDMM/StrongDMM.exe b/tools/StrongDMM/StrongDMM.exe
index b499c8d2f9c..d1b2d63d254 100644
Binary files a/tools/StrongDMM/StrongDMM.exe and b/tools/StrongDMM/StrongDMM.exe differ