diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 5f24f10b4b..fe6e94605b 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -167,13 +167,9 @@
 	listener = newloc.AddComponent(/datum/component/redirect, COMSIG_ATOM_EXITED, CALLBACK(src, .proc/check_exit))
 
 /obj/item/assembly/infra/proc/check_exit(atom/movable/offender)
-<<<<<<< HEAD
-	if(offender && ((offender.flags_1 & ABSTRACT_1) || offender == src))
-=======
 	if(QDELETED(src))
 		return
 	if(offender == src || istype(offender,/obj/effect/beam/i_beam))
->>>>>>> 641a7d1... Fixes infrared emmiters partially. (#38301)
 		return
 	return refreshBeam()