diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm
index 28474b8796..10c28a5c40 100644
--- a/code/game/objects/effects/alien/aliens.dm
+++ b/code/game/objects/effects/alien/aliens.dm
@@ -404,16 +404,11 @@
 
 		if(istype(target, /turf/simulated/wall)) // I hate turf code.
 			var/turf/simulated/wall/W = target
-<<<<<<< HEAD
-			W.dismantle_wall(1)
-		else
-=======
 			W.dismantle_wall()
 		else if(isfloor(target))
 			var/turf/simulated/floor/T = target
 			T.ex_act(1)
 		else if(isobj(target))
->>>>>>> 181a26b039 (Merge pull request #11434 from MisterGrimm/XenomorphOverhaul)
 			qdel(target)
 		qdel(src)
 		return