diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 183e90595e..636c2b7890 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -1,28 +1,3 @@
-<<<<<<< HEAD
-/datum/species/shadow
-	// Humans cursed to stay in the darkness, lest their life forces drain. They regain health in shadow and die in light.
-	name = "???"
-	id = "shadow"
-	sexes = 0
-	blacklisted = 1
-	ignored_by = list(/mob/living/simple_animal/hostile/faithless)
-	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
-	species_traits = list(NOBREATH,NOBLOOD,RADIMMUNE,VIRUSIMMUNE)
-	dangerous_existence = 1
-	mutanteyes = /obj/item/organ/eyes/night_vision
-
-
-/datum/species/shadow/spec_life(mob/living/carbon/human/H)
-	var/light_amount = 0
-	if(isturf(H.loc))
-		var/turf/T = H.loc
-		light_amount = T.get_lumcount()
-
-		if(light_amount > 0.2) //if there's enough light, start dying
-			H.take_overall_damage(1,1)
-		else if (light_amount < 0.2) //heal in the dark
-			H.heal_overall_damage(1,1)
-=======
 /datum/species/shadow
 	// Humans cursed to stay in the darkness, lest their life forces drain. They regain health in shadow and die in light.
 	name = "???"
@@ -138,4 +113,3 @@
 		visible_message("<span class='danger'>[O] is disintegrated by [src]!</span>")
 		O.burn()
 	playsound(src, 'sound/items/welder.ogg', 50, 1)
->>>>>>> 35279a3... Nightmare (#30415)