diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 13e87f4f03..e087b23392 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -377,11 +377,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	sleep(100)
 	for(var/mob/living/L in GLOB.mob_list)
 		var/turf/T = get_turf(L)
-<<<<<<< HEAD
-		if(!T || T.z != z_level)
-=======
 		if(!T || !(T.z in GLOB.station_z_levels))
->>>>>>> c36ee83... typo
 			continue
 		if(issilicon(L))
 			continue
@@ -831,4 +827,4 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		AI.eyeobj.relay_speech = TRUE
 
 #undef DEFAULT_DOOMSDAY_TIMER
-#undef DOOMSDAY_ANNOUNCE_INTERVAL
\ No newline at end of file
+#undef DOOMSDAY_ANNOUNCE_INTERVAL