diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm
index 35bedfe831..047056cac4 100644
--- a/code/modules/antagonists/changeling/powers/absorb.dm
+++ b/code/modules/antagonists/changeling/powers/absorb.dm
@@ -1,125 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/proc_holder/changeling/absorbDNA
-	name = "Absorb DNA"
-	desc = "Absorb the DNA of our victim."
-	chemical_cost = 0
-	dna_cost = 0
-	req_human = 1
-
-/obj/effect/proc_holder/changeling/absorbDNA/can_sting(mob/living/carbon/user)
-	if(!..())
-		return
-
-	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
-	if(changeling.isabsorbing)
-		to_chat(user, "<span class='warning'>We are already absorbing!</span>")
-		return
-
-	if(!user.pulling || !iscarbon(user.pulling))
-		to_chat(user, "<span class='warning'>We must be grabbing a creature to absorb them!</span>")
-		return
-	if(user.grab_state <= GRAB_NECK)
-		to_chat(user, "<span class='warning'>We must have a tighter grip to absorb this creature!</span>")
-		return
-
-	var/mob/living/carbon/target = user.pulling
-	return changeling.can_absorb_dna(target)
-
-
-
-/obj/effect/proc_holder/changeling/absorbDNA/sting_action(mob/user)
-	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
-	var/mob/living/carbon/human/target = user.pulling
-	changeling.isabsorbing = 1
-	for(var/i in 1 to 3)
-		switch(i)
-			if(1)
-				to_chat(user, "<span class='notice'>This creature is compatible. We must hold still...</span>")
-			if(2)
-				user.visible_message("<span class='warning'>[user] extends a proboscis!</span>", "<span class='notice'>We extend a proboscis.</span>")
-			if(3)
-				user.visible_message("<span class='danger'>[user] stabs [target] with the proboscis!</span>", "<span class='notice'>We stab [target] with the proboscis.</span>")
-				to_chat(target, "<span class='userdanger'>You feel a sharp stabbing pain!</span>")
-				target.take_overall_damage(40)
-
-		SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("Absorb DNA", "[i]"))
-		if(!do_mob(user, target, 150))
-			to_chat(user, "<span class='warning'>Our absorption of [target] has been interrupted!</span>")
-			changeling.isabsorbing = 0
-			return
-
-	SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("Absorb DNA", "4"))
-	user.visible_message("<span class='danger'>[user] sucks the fluids from [target]!</span>", "<span class='notice'>We have absorbed [target].</span>")
-	to_chat(target, "<span class='userdanger'>You are absorbed by the changeling!</span>")
-
-	if(!changeling.has_dna(target.dna))
-		changeling.add_new_profile(target)
-
-	if(user.nutrition < NUTRITION_LEVEL_WELL_FED)
-		user.nutrition = min((user.nutrition + target.nutrition), NUTRITION_LEVEL_WELL_FED)
-
-	if(target.mind)//if the victim has got a mind
-		// Absorb a lizard, speak Draconic.
-		user.copy_known_languages_from(target)
-
-		target.mind.show_memory(user, 0) //I can read your mind, kekeke. Output all their notes.
-
-		//Some of target's recent speech, so the changeling can attempt to imitate them better.
-		//Recent as opposed to all because rounds tend to have a LOT of text.
-		var/list/recent_speech = list()
-
-		var/list/say_log = target.logging[INDIVIDUAL_SAY_LOG]
-
-		if(LAZYLEN(say_log) > LING_ABSORB_RECENT_SPEECH)
-			recent_speech = say_log.Copy(say_log.len-LING_ABSORB_RECENT_SPEECH+1,0) //0 so len-LING_ARS+1 to end of list
-		else
-			for(var/spoken_memory in say_log)
-				if(recent_speech.len >= LING_ABSORB_RECENT_SPEECH)
-					break
-				recent_speech[spoken_memory] = say_log[spoken_memory]
-
-		if(recent_speech.len)
-			changeling.antag_memory += "<B>Some of [target]'s speech patterns, we should study these to better impersonate them!</B><br>"
-			to_chat(user, "<span class='boldnotice'>Some of [target]'s speech patterns, we should study these to better impersonate them!</span>")
-			for(var/spoken_memory in recent_speech)
-				changeling.antag_memory += "\"[recent_speech[spoken_memory]]\"<br>"
-				to_chat(user, "<span class='notice'>\"[recent_speech[spoken_memory]]\"</span>")
-			changeling.antag_memory += "<B>We have no more knowledge of [target]'s speech patterns.</B><br>"
-			to_chat(user, "<span class='boldnotice'>We have no more knowledge of [target]'s speech patterns.</span>")
-
-
-		var/datum/antagonist/changeling/target_ling = target.mind.has_antag_datum(/datum/antagonist/changeling)
-		if(target_ling)//If the target was a changeling, suck out their extra juice and objective points!
-			to_chat(user, "<span class='boldnotice'>[target] was one of us. We have absorbed their power.</span>")
-			target_ling.remove_changeling_powers()
-			changeling.geneticpoints += round(target_ling.geneticpoints/2)
-			target_ling.geneticpoints = 0
-			target_ling.canrespec = 0
-			changeling.chem_storage += round(target_ling.chem_storage/2)
-			changeling.chem_charges += min(target_ling.chem_charges, changeling.chem_storage)
-			target_ling.chem_charges = 0
-			target_ling.chem_storage = 0
-			changeling.absorbedcount += (target_ling.absorbedcount)
-			target_ling.stored_profiles.len = 1
-			target_ling.absorbedcount = 0
-
-
-	changeling.chem_charges=min(changeling.chem_charges+10, changeling.chem_storage)
-
-	changeling.isabsorbing = 0
-	changeling.canrespec = 1
-
-	target.death(0)
-	target.Drain()
-	return TRUE
-
-
-
-//Absorbs the target DNA.
-//datum/changeling/proc/absorb_dna(mob/living/carbon/T, mob/user)
-
-//datum/changeling/proc/store_dna(datum/dna/new_dna, mob/user)
-=======
 /obj/effect/proc_holder/changeling/absorbDNA
 	name = "Absorb DNA"
 	desc = "Absorb the DNA of our victim."
@@ -241,4 +119,3 @@
 //datum/changeling/proc/absorb_dna(mob/living/carbon/T, mob/user)
 
 //datum/changeling/proc/store_dna(datum/dna/new_dna, mob/user)
->>>>>>> bcf568f... adds new changeling var that counts actual absorbs, uses it for Spiders ability (#37081)