diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm
index 38e9ba01ef..84e5884ffb 100644
--- a/code/datums/diseases/advance/symptoms/symptoms.dm
+++ b/code/datums/diseases/advance/symptoms/symptoms.dm
@@ -1,20 +1,20 @@
-// Symptoms are the effects that engineered advanced diseases do.
-
-/datum/symptom
-	// Buffs/Debuffs the symptom has to the overall engineered disease.
-	var/name = ""
+// Symptoms are the effects that engineered advanced diseases do.
+
+/datum/symptom
+	// Buffs/Debuffs the symptom has to the overall engineered disease.
+	var/name = ""
 	var/desc = "If you see this something went very wrong." //Basic symptom description
 	var/threshold_desc = "" //Description of threshold effects
-	var/stealth = 0
-	var/resistance = 0
-	var/stage_speed = 0
-	var/transmittable = 0
-	// The type level of the symptom. Higher is harder to generate.
-	var/level = 0
-	// The severity level of the symptom. Higher is more dangerous.
-	var/severity = 0
-	// The hash tag for our diseases, we will add it up with our other symptoms to get a unique id! ID MUST BE UNIQUE!!!
-	var/id = ""
+	var/stealth = 0
+	var/resistance = 0
+	var/stage_speed = 0
+	var/transmittable = 0
+	// The type level of the symptom. Higher is harder to generate.
+	var/level = 0
+	// The severity level of the symptom. Higher is more dangerous.
+	var/severity = 0
+	// The hash tag for our diseases, we will add it up with our other symptoms to get a unique id! ID MUST BE UNIQUE!!!
+	var/id = ""
 	//Base chance of sending warning messages, so it can be modified
 	var/base_message_chance = 10
 	//If the early warnings are suppressed or not
@@ -28,26 +28,11 @@
 	//A neutered symptom has no effect, and only affects statistics.
 	var/neutered = FALSE
 	var/list/thresholds
-
-/datum/symptom/New()
-	var/list/S = SSdisease.list_symptoms
-	for(var/i = 1; i <= S.len; i++)
+
+/datum/symptom/New()
+	var/list/S = SSdisease.list_symptoms
+	for(var/i = 1; i <= S.len; i++)
 		if(type == S[i])
-<<<<<<< HEAD
-			id = "[i]"
-			return
-	CRASH("We couldn't assign an ID!")
-
-// Called when processing of the advance disease, which holds this symptom, starts.
-/datum/symptom/proc/Start(datum/disease/advance/A)
-	next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10) //so it doesn't instantly activate on infection
-
-// Called when the advance disease is going to be deleted or when the advance disease stops processing.
-/datum/symptom/proc/End(datum/disease/advance/A)
-	return
-
-/datum/symptom/proc/Activate(datum/disease/advance/A)
-=======
 			id = "[i]"
 			return
 	CRASH("We couldn't assign an ID!")
@@ -66,7 +51,6 @@
 	return TRUE
 
 /datum/symptom/proc/Activate(datum/disease/advance/A)
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(neutered)
 		return FALSE
 	if(world.time < next_activation)
@@ -74,7 +58,7 @@
 	else
 		next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10)
 		return TRUE
-
+
 /datum/symptom/proc/Copy()
 	var/datum/symptom/new_symp = new type
 	new_symp.name = name