diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index c8f74aff81..20d6cf23f9 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -208,15 +208,6 @@
 
 	for(var/turf/T in dstturfs)
 		var/turf/D = locate(T.x, throwy - 1, T.z)
-<<<<<<< HEAD
-		for(var/I in T)
-			if(istype(I,/mob/living))
-				var/mob/living/L = I
-				L.gib()
-			else if(istype(I,/obj))
-				var/obj/O = I
-				O.forceMove(D)
-=======
 		for(var/atom/movable/AM as mob|obj in T)
 			AM.Move(D)
 
@@ -225,7 +216,6 @@
 
 	for(var/mob/living/simple_mob/pest in destination)
 		pest.gib()
->>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
 
 	origin.move_contents_to(destination, direction=direction)