diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index cb719da38e..2b95b35051 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -160,11 +160,7 @@
 	// We're still cooling down from the last move
 	if(!my_mob.checkMoveCooldown())
 		return
-<<<<<<< HEAD
-	DEBUG_INPUT("--------")
-=======
 		DEBUG_INPUT("--------")
->>>>>>> c463104999a... Ports Diagonal Movement (#8199)
 	next_move_dir_add = 0	// This one I *think* exists so you can tap move and it will move even if delay isn't quite up.
 	next_move_dir_sub = 0 	// I'm not really sure why next_move_dir_sub even exists.