diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm
index 6e24ce78ab..45b4a28bb5 100644
--- a/code/modules/mob/living/carbon/human/species_types/synths.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synths.dm
@@ -1,125 +1,3 @@
-<<<<<<< HEAD
-/datum/species/synth
-	name = "Synth" //inherited from the real species, for health scanners and things
-	id = "synth"
-	say_mod = "beep boops" //inherited from a user's real species
-	sexes = 0
-	species_traits = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER) //all of these + whatever we inherit from the real species
-	dangerous_existence = 1
-	blacklisted = 1
-	meat = null
-	damage_overlay_type = "synth"
-	limbs_id = "synth"
-	var/list/initial_species_traits = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER) //for getting these values back for assume_disguise()
-	var/disguise_fail_health = 75 //When their health gets to this level their synthflesh partially falls off
-	var/datum/species/fake_species = null //a species to do most of our work for us, unless we're damaged
-
-/datum/species/synth/military
-	name = "Military Synth"
-	id = "military_synth"
-	armor = 25
-	punchdamagelow = 10
-	punchdamagehigh = 19
-	punchstunthreshold = 14 //about 50% chance to stun
-	disguise_fail_health = 50
-
-/datum/species/synth/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
-	..()
-	assume_disguise(old_species, H)
-
-/datum/species/synth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == "synthflesh")
-		chem.reaction_mob(H, TOUCH, 2 ,0) //heal a little
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
-		return 1
-	else
-		return ..()
-
-
-/datum/species/synth/proc/assume_disguise(datum/species/S, mob/living/carbon/human/H)
-	if(S && !istype(S, type))
-		name = S.name
-		say_mod = S.say_mod
-		sexes = S.sexes
-		species_traits = initial_species_traits.Copy()
-		species_traits.Add(S.species_traits)
-		attack_verb = S.attack_verb
-		attack_sound = S.attack_sound
-		miss_sound = S.miss_sound
-		meat = S.meat
-		mutant_bodyparts = S.mutant_bodyparts.Copy()
-		mutant_organs = S.mutant_organs.Copy()
-		default_features = S.default_features.Copy()
-		nojumpsuit = S.nojumpsuit
-		no_equip = S.no_equip.Copy()
-		limbs_id = S.limbs_id
-		use_skintones = S.use_skintones
-		fixed_mut_color = S.fixed_mut_color
-		hair_color = S.hair_color
-		fake_species = new S.type
-	else
-		name = initial(name)
-		say_mod = initial(say_mod)
-		species_traits = initial_species_traits.Copy()
-		attack_verb = initial(attack_verb)
-		attack_sound = initial(attack_sound)
-		miss_sound = initial(miss_sound)
-		mutant_bodyparts = list()
-		default_features = list()
-		nojumpsuit = initial(nojumpsuit)
-		no_equip = list()
-		qdel(fake_species)
-		fake_species = null
-		meat = initial(meat)
-		limbs_id = "synth"
-		use_skintones = 0
-		sexes = 0
-		fixed_mut_color = ""
-		hair_color = ""
-
-	for(var/X in H.bodyparts) //propagates the damage_overlay changes
-		var/obj/item/bodypart/BP = X
-		BP.update_limb()
-	H.update_body_parts() //to update limb icon cache with the new damage overlays
-
-//Proc redirects:
-//Passing procs onto the fake_species, to ensure we look as much like them as possible
-
-/datum/species/synth/handle_hair(mob/living/carbon/human/H, forced_colour)
-	if(fake_species)
-		fake_species.handle_hair(H, forced_colour)
-	else
-		return ..()
-
-
-/datum/species/synth/handle_body(mob/living/carbon/human/H)
-	if(fake_species)
-		fake_species.handle_body(H)
-	else
-		return ..()
-
-
-/datum/species/synth/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
-	if(fake_species)
-		fake_species.handle_body(H,forced_colour)
-	else
-		return ..()
-
-
-/datum/species/synth/get_spans()
-	if(fake_species)
-		return fake_species.get_spans()
-	return list()
-
-
-/datum/species/synth/handle_speech(message, mob/living/carbon/human/H)
-	if(H.health > disguise_fail_health)
-		if(fake_species)
-			return fake_species.handle_speech(message,H)
-		else
-			return ..()
-	else
-=======
 /datum/species/synth
 	name = "Synth" //inherited from the real species, for health scanners and things
 	id = "synth"
@@ -240,5 +118,4 @@
 		else
 			return ..()
 	else
->>>>>>> ed43a09... Prevents the creation of Shadowzombiechangelings (#30681)
 		return ..()