diff --git a/code/modules/antagonists/changeling/powers/spiders.dm b/code/modules/antagonists/changeling/powers/spiders.dm
index 319029a6e0..685767f601 100644
--- a/code/modules/antagonists/changeling/powers/spiders.dm
+++ b/code/modules/antagonists/changeling/powers/spiders.dm
@@ -1,17 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/proc_holder/changeling/spiders
-	name = "Spread Infestation"
-	desc = "Our form divides, creating arachnids which will grow into deadly beasts."
-	helptext = "The spiders are thoughtless creatures, and may attack their creators when fully grown. Requires at least 5 DNA absorptions."
-	chemical_cost = 45
-	dna_cost = 1
-	req_dna = 5
-
-//Makes some spiderlings. Good for setting traps and causing general trouble.
-/obj/effect/proc_holder/changeling/spiders/sting_action(mob/user)
-	spawn_atom_to_turf(/obj/structure/spider/spiderling/hunter, user, 2, FALSE)
-	return TRUE
-=======
 /obj/effect/proc_holder/changeling/spiders
 	name = "Spread Infestation"
 	desc = "Our form divides, creating arachnids which will grow into deadly beasts."
@@ -24,4 +10,3 @@
 /obj/effect/proc_holder/changeling/spiders/sting_action(mob/user)
 	spawn_atom_to_turf(/obj/structure/spider/spiderling/hunter, user, 2, FALSE)
 	return TRUE
->>>>>>> bcf568f... adds new changeling var that counts actual absorbs, uses it for Spiders ability (#37081)