diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm
index c2e1eb78b2..836b4a4719 100644
--- a/code/datums/diseases/advance/symptoms/genetics.dm
+++ b/code/datums/diseases/advance/symptoms/genetics.dm
@@ -1,31 +1,31 @@
-/*
-//////////////////////////////////////
-
-DNA Saboteur
-
-	Very noticable.
-	Lowers resistance tremendously.
-	No changes to stage speed.
-	Decreases transmittablity tremendously.
-	Fatal Level.
-
-Bonus
-	Cleans the DNA of a person and then randomly gives them a disability.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/genetic_mutation
-	name = "Deoxyribonucleic Acid Saboteur"
+/*
+//////////////////////////////////////
+
+DNA Saboteur
+
+	Very noticable.
+	Lowers resistance tremendously.
+	No changes to stage speed.
+	Decreases transmittablity tremendously.
+	Fatal Level.
+
+Bonus
+	Cleans the DNA of a person and then randomly gives them a disability.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/genetic_mutation
+	name = "Deoxyribonucleic Acid Saboteur"
 	desc = "The virus bonds with the DNA of the host, causing damaging mutations until removed."
-	stealth = -2
-	resistance = -3
-	stage_speed = 0
-	transmittable = -3
-	level = 6
-	severity = 3
-	var/list/possible_mutations
-	var/archived_dna = null
+	stealth = -2
+	resistance = -3
+	stage_speed = 0
+	transmittable = -3
+	level = 6
+	severity = 3
+	var/list/possible_mutations
+	var/archived_dna = null
 	base_message_chance = 50
 	symptom_delay_min = 60
 	symptom_delay_max = 120
@@ -33,8 +33,8 @@ Bonus
 	threshold_desc = "<b>Resistance 8:</b> Causes two harmful mutations at once.<br>\
 					  <b>Stage Speed 10:</b> Increases mutation frequency.<br>\
 					  <b>Stealth 5:</b> The mutations persist even if the virus is cured."
-
-/datum/symptom/genetic_mutation/Activate(datum/disease/advance/A)
+
+/datum/symptom/genetic_mutation/Activate(datum/disease/advance/A)
 	if(!..())
 		return
 	var/mob/living/carbon/C = A.affected_mob
@@ -45,20 +45,12 @@ Bonus
 			to_chat(C, "<span class='warning'>[pick("Your skin feels itchy.", "You feel light headed.")]</span>")
 			C.dna.remove_mutation_group(possible_mutations)
 			for(var/i in 1 to power)
-<<<<<<< HEAD
-				C.randmut(possible_mutations)
-
-// Archive their DNA before they were infected.
-/datum/symptom/genetic_mutation/Start(datum/disease/advance/A)
-	..()
-=======
 				C.randmut(possible_mutations)
 
 // Archive their DNA before they were infected.
 /datum/symptom/genetic_mutation/Start(datum/disease/advance/A)
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(A.properties["stealth"] >= 5) //don't restore dna after curing
 		no_reset = TRUE
 	if(A.properties["stage_rate"] >= 10) //mutate more often
@@ -66,17 +58,6 @@ Bonus
 		symptom_delay_max = 60
 	if(A.properties["resistance"] >= 8) //mutate twice
 		power = 2
-<<<<<<< HEAD
-	possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.mutations_list[RACEMUT]
-	var/mob/living/carbon/M = A.affected_mob
-	if(M)
-		if(!M.has_dna())
-			return
-		archived_dna = M.dna.struc_enzymes
-
-// Give them back their old DNA when cured.
-/datum/symptom/genetic_mutation/End(datum/disease/advance/A)
-=======
 	possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.mutations_list[RACEMUT]
 	var/mob/living/carbon/M = A.affected_mob
 	if(M)
@@ -88,7 +69,6 @@ Bonus
 /datum/symptom/genetic_mutation/End(datum/disease/advance/A)
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(!no_reset)
 		var/mob/living/carbon/M = A.affected_mob
 		if(M && archived_dna)