diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 97bd22430b..8e72b26419 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -47,7 +47,4 @@
 	buckle_lying = FALSE
 
 	var/creamed = FALSE //to use with creampie overlays
-<<<<<<< HEAD
-=======
 	var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
->>>>>>> 8e434b7... Removes duplicate typecaches (#31883)