diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 3e1724150a..9f31c5b055 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //The code execution of the emote datum is located at code/datums/emotes.dm
 /mob/living/emote(act, m_type = null, message = null)
 	act = lowertext(act)