diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index 3b12271d78..71286ef691 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -1,104 +1,3 @@
-<<<<<<< HEAD
-/datum/emote/living/carbon
-	mob_type_allowed_typecache = list(/mob/living/carbon)
-
-/datum/emote/living/carbon/airguitar
-	key = "airguitar"
-	message = "is strumming the air and headbanging like a safari chimp."
-	restraint_check = TRUE
-
-/datum/emote/living/carbon/blink
-	key = "blink"
-	key_third_person = "blinks"
-	message = "blinks."
-
-/datum/emote/living/carbon/blink_r
-	key = "blink_r"
-	message = "blinks rapidly."
-
-/datum/emote/living/carbon/clap
-	key = "clap"
-	key_third_person = "claps"
-	message = "claps."
-	muzzle_ignore = TRUE
-	restraint_check = TRUE
-	emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/carbon/clap/run_emote(mob/living/user, params)
-	. = ..()
-	if (.)
-		if (ishuman(user))
-			// Need hands to clap
-			if (!user.get_bodypart("l_arm") || !user.get_bodypart("r_arm"))
-				return
-			var/clap = pick('sound/misc/clap1.ogg',
-				            'sound/misc/clap2.ogg',
-				            'sound/misc/clap3.ogg',
-				            'sound/misc/clap4.ogg')
-			playsound(user, clap, 50, 1, -1)
-
-/datum/emote/living/carbon/gnarl
-	key = "gnarl"
-	key_third_person = "gnarls"
-	message = "gnarls and shows its teeth..."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
-
-/datum/emote/living/carbon/moan
-	key = "moan"
-	key_third_person = "moans"
-	message = "moans!"
-	message_mime = "appears to moan!"
-	emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/carbon/roll
-	key = "roll"
-	key_third_person = "rolls"
-	message = "rolls."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
-	restraint_check = TRUE
-
-/datum/emote/living/carbon/scratch
-	key = "scratch"
-	key_third_person = "scratches"
-	message = "scratches."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
-	restraint_check = TRUE
-
-/datum/emote/living/carbon/screech
-	key = "screech"
-	key_third_person = "screeches"
-	message = "screeches."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
-
-/datum/emote/living/carbon/sign
-	key = "sign"
-	key_third_person = "signs"
-	message_param = "signs the number %t."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
-	restraint_check = TRUE
-
-/datum/emote/living/carbon/sign/select_param(mob/user, params)
-	. = ..()
-	if(!isnum(text2num(params)))
-		return message
-
-/datum/emote/living/carbon/sign/signal
-	key = "signal"
-	key_third_person = "signals"
-	message_param = "raises %t fingers."
-	mob_type_allowed_typecache = list(/mob/living/carbon/human)
-	restraint_check = TRUE
-
-/datum/emote/living/carbon/tail
-	key = "tail"
-	message = "waves their tail."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
-
-/datum/emote/living/carbon/wink
-	key = "wink"
-	key_third_person = "winks"
-	message = "winks."
-=======
 /datum/emote/living/carbon
 	mob_type_allowed_typecache = list(/mob/living/carbon)
 
@@ -198,4 +97,3 @@
 	key = "wink"
 	key_third_person = "winks"
 	message = "winks."
->>>>>>> 5e87230... Cleans up clap bodypart check