diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index d8d7c40ee2..116be93cec 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /mob/living/Moved()
 	. = ..()
 	update_turf_movespeed(loc)