diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm
index dbe52a56fe..1c356247ee 100644
--- a/code/datums/diseases/advance/symptoms/itching.dm
+++ b/code/datums/diseases/advance/symptoms/itching.dm
@@ -1,44 +1,40 @@
-/*
-//////////////////////////////////////
-
-Itching
-
-	Not noticable or unnoticable.
-	Resistant.
-	Increases stage speed.
-	Little transmittable.
-	Low Level.
-
-BONUS
-	Displays an annoying message!
-	Should be used for buffing your disease.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/itching
-
-	name = "Itching"
+/*
+//////////////////////////////////////
+
+Itching
+
+	Not noticable or unnoticable.
+	Resistant.
+	Increases stage speed.
+	Little transmittable.
+	Low Level.
+
+BONUS
+	Displays an annoying message!
+	Should be used for buffing your disease.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/itching
+
+	name = "Itching"
 	desc = "The virus irritates the skin, causing itching."
-	stealth = 0
-	resistance = 3
-	stage_speed = 3
-	transmittable = 1
-	level = 1
-	severity = 1
+	stealth = 0
+	resistance = 3
+	stage_speed = 3
+	transmittable = 1
+	level = 1
+	severity = 1
 	symptom_delay_min = 5
 	symptom_delay_max = 25
 	var/scratch = FALSE
 	threshold_desc = "<b>Transmission 6:</b> Increases frequency of itching.<br>\
 					  <b>Stage Speed 7:</b> The host will scrath itself when itching, causing superficial damage."
-
+
 /datum/symptom/itching/Start(datum/disease/advance/A)
-<<<<<<< HEAD
-	..()
-=======
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(A.properties["transmittable"] >= 6) //itch more often
 		symptom_delay_min = 1
 		symptom_delay_max = 4
@@ -55,4 +51,4 @@ BONUS
 		var/can_scratch = scratch && !M.incapacitated() && get_location_accessible(M, picked_bodypart)
 		M.visible_message("[can_scratch ? "<span class='warning'>[M] scratches [M.p_their()] [bodypart.name].</span>" : ""]", "<span class='warning'>Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]</span>")
 		if(can_scratch)
-			bodypart.receive_damage(0.5)
\ No newline at end of file
+			bodypart.receive_damage(0.5)