diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
index 76c36b1bf4..748d63461b 100644
--- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
@@ -44,11 +44,8 @@
 	//var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels)
 	for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines)
 		// Delaminating, not within coverage, not on a tile.
-<<<<<<< HEAD
 		if(!(S.z == ZLEVEL_STATION || S.z == ZLEVEL_MINING || S.z == T.z) || !istype(S.loc, /turf/))
-=======
 		if(!(S.z in GLOB.station_z_levels) || S.z == ZLEVEL_MINING || S.z == T.z || !istype(S.loc, /turf/))
->>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing)
 			continue
 		supermatters.Add(S)