diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index e80b690737..f2c84a5aae 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -14,12 +14,9 @@ All ShuttleMove procs go here
 // Called from the new turf before anything has been moved
 // Only gets called if fromShuttleMove returns true first
 // returns the new move_mode (based on the old)
-<<<<<<< HEAD
 /turf/proc/toShuttleMove(turf/oldT, shuttle_dir, move_mode)
-=======
 /turf/proc/toShuttleMove(turf/oldT, move_mode, obj/docking_port/mobile/shuttle)
 	var/shuttle_dir = shuttle.dir
->>>>>>> 9ac60a8... Typo
 	for(var/i in contents)
 		var/atom/movable/thing = i
 		if(ismob(thing))
@@ -388,4 +385,4 @@ All ShuttleMove procs go here
 
 /obj/effect/abstract/proximity_checker/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
 	//timer so it only happens once
-	addtimer(CALLBACK(monitor, /datum/proximity_monitor/proc/SetRange, monitor.current_range, TRUE), 0, TIMER_UNIQUE)
\ No newline at end of file
+	addtimer(CALLBACK(monitor, /datum/proximity_monitor/proc/SetRange, monitor.current_range, TRUE), 0, TIMER_UNIQUE)