diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 0e500db8ec..206b61fb35 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -1,59 +1,12 @@
-/datum/disease/flu
-	name = "The Flu"
-	max_stages = 3
-	spread_text = "Airborne"
-	cure_text = "Spaceacillin"
-	cures = list("spaceacillin")
-	cure_chance = 10
-	agent = "H13N1 flu virion"
+/datum/disease/flu
+	name = "The Flu"
+	max_stages = 3
+	spread_text = "Airborne"
+	cure_text = "Spaceacillin"
+	cures = list("spaceacillin")
+	cure_chance = 10
+	agent = "H13N1 flu virion"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
-<<<<<<< HEAD
-	permeability_mod = 0.75
-	desc = "If left untreated the subject will feel quite unwell."
-	severity = MEDIUM
-
-/datum/disease/flu/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			if(affected_mob.lying && prob(20))
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				stage--
-				return
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
-				if(prob(20))
-					affected_mob.take_bodypart_damage(1)
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
-				if(prob(20))
-					affected_mob.adjustToxLoss(1)
-					affected_mob.updatehealth()
-
-		if(3)
-			if(affected_mob.lying && prob(15))
-				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-				stage--
-				return
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
-				if(prob(20))
-					affected_mob.take_bodypart_damage(1)
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
-				if(prob(20))
-					affected_mob.adjustToxLoss(1)
-					affected_mob.updatehealth()
-	return
-=======
 	permeability_mod = 0.75
 	desc = "If left untreated the subject will feel quite unwell."
 	severity = VIRUS_SEVERITY_MINOR
@@ -99,4 +52,3 @@
 					affected_mob.adjustToxLoss(1)
 					affected_mob.updatehealth()
 	return
->>>>>>> db0c10e... Refactors virus spreading (#31066)