diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index b29f39ad40..9d9e327fec 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /mob/living/carbon/alien/humanoid
 	name = "alien"
 	icon_state = "alien"