diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm
index d92fe0eef9..5b0b851ca0 100644
--- a/code/datums/diseases/advance/symptoms/fever.dm
+++ b/code/datums/diseases/advance/symptoms/fever.dm
@@ -1,49 +1,45 @@
-/*
-//////////////////////////////////////
-
-Fever
-
-	No change to hidden.
-	Increases resistance.
-	Increases stage speed.
-	Little transmittable.
-	Low level.
-
-Bonus
-	Heats up your body.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/fever
-	name = "Fever"
+/*
+//////////////////////////////////////
+
+Fever
+
+	No change to hidden.
+	Increases resistance.
+	Increases stage speed.
+	Little transmittable.
+	Low level.
+
+Bonus
+	Heats up your body.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/fever
+	name = "Fever"
 	desc = "The virus causes a febrile response from the host, raising its body temperature."
-	stealth = 0
-	resistance = 3
-	stage_speed = 3
-	transmittable = 2
-	level = 2
-	severity = 2
+	stealth = 0
+	resistance = 3
+	stage_speed = 3
+	transmittable = 2
+	level = 2
+	severity = 2
 	base_message_chance = 20
 	symptom_delay_min = 10
 	symptom_delay_max = 30
 	var/unsafe = FALSE //over the heat threshold
 	threshold_desc = "<b>Resistance 5:</b> Increases fever intensity, fever can overheat and harm the host.<br>\
 					  <b>Resistance 10:</b> Further increases fever intensity."
-
+
 /datum/symptom/fever/Start(datum/disease/advance/A)
-<<<<<<< HEAD
-	..()
-=======
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(A.properties["resistance"] >= 5) //dangerous fever
 		power = 1.5
 		unsafe = TRUE
 	if(A.properties["resistance"] >= 10)
 		power = 2.5
-
+
 /datum/symptom/fever/Activate(datum/disease/advance/A)
 	if(!..())
 		return
@@ -54,11 +50,11 @@ Bonus
 		to_chat(M, "<span class='userdanger'>[pick("You feel too hot.", "You feel like your blood is boiling.")]</span>")
 	if(M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT || unsafe)
 		Heat(M, A)
-
-/datum/symptom/fever/proc/Heat(mob/living/M, datum/disease/advance/A)
+
+/datum/symptom/fever/proc/Heat(mob/living/M, datum/disease/advance/A)
 	var/get_heat = 6 * power
 	if(!unsafe)
 		M.bodytemperature = min(M.bodytemperature + (get_heat * A.stage), BODYTEMP_HEAT_DAMAGE_LIMIT - 1)
 	else
 		M.bodytemperature += (get_heat * A.stage)
-	return 1
+	return 1