diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm
index 3f88cdb609..9c0d79e233 100644
--- a/code/game/gamemodes/changeling/powers/mimic_voice.dm
+++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm
@@ -1,32 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/proc_holder/changeling/mimicvoice
-	name = "Mimic Voice"
-	desc = "We shape our vocal glands to sound like a desired voice."
-	helptext = "Will turn your voice into the name that you enter. We must constantly expend chemicals to maintain our form like this."
-	chemical_cost = 0 //constant chemical drain hardcoded
-	dna_cost = 1
-	req_human = 1
-
-
-// Fake Voice
-/obj/effect/proc_holder/changeling/mimicvoice/sting_action(mob/user)
-	var/datum/changeling/changeling=user.mind.changeling
-	if(changeling.mimicing)
-		changeling.mimicing = ""
-		changeling.chem_recharge_slowdown -= 0.5
-		to_chat(user, "<span class='notice'>We return our vocal glands to their original position.</span>")
-		return
-
-	var/mimic_voice = stripped_input(user, "Enter a name to mimic.", "Mimic Voice", null, MAX_NAME_LEN)
-	if(!mimic_voice)
-		return
-
-	changeling.mimicing = mimic_voice
-	changeling.chem_recharge_slowdown += 0.5
-	to_chat(user, "<span class='notice'>We shape our glands to take the voice of <b>[mimic_voice]</b>, this will slow down regenerating chemicals while active.</span>")
-	to_chat(user, "<span class='notice'>Use this power again to return to our original voice and return chemical production to normal levels.</span>")
-	return TRUE
-=======
 /obj/effect/proc_holder/changeling/mimicvoice
 	name = "Mimic Voice"
 	desc = "We shape our vocal glands to sound like a desired voice."
@@ -54,4 +25,3 @@
 	to_chat(user, "<span class='notice'>We shape our glands to take the voice of <b>[mimic_voice]</b>, this will slow down regenerating chemicals while active.</span>")
 	to_chat(user, "<span class='notice'>Use this power again to return to our original voice and return chemical production to normal levels.</span>")
 	return TRUE
->>>>>>> 70d0357... Ling datum antag standarization. (#32183)