diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 206f6ad334d..762371b192b 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -240,11 +240,7 @@
 			message = "faints."
 			if(sleeping)
 				return //Can't faint while asleep
-<<<<<<< HEAD
-			sleeping += 10 //Short-short nap
-=======
 			Sleeping(10)
->>>>>>> 55b2c8d... Merge pull request #7354 from Neerti/status_indicators
 			m_type = 1
 
 		if("cough", "coughs")