diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm
index 6aa18a5d59..855f1f44f0 100644
--- a/code/datums/diseases/rhumba_beat.dm
+++ b/code/datums/diseases/rhumba_beat.dm
@@ -1,20 +1,3 @@
-<<<<<<< HEAD
-/datum/disease/rhumba_beat
-	name = "The Rhumba Beat"
-	max_stages = 5
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Chick Chicky Boom!"
-	cures = list("plasma")
-	agent = "Unknown"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	permeability_mod = 1
-	severity = BIOHAZARD
-
-/datum/disease/rhumba_beat/stage_act()
-	..()
-	if(affected_mob.ckey == "rosham")
-=======
 /datum/disease/rhumba_beat
 	name = "The Rhumba Beat"
 	max_stages = 5
@@ -30,33 +13,32 @@
 /datum/disease/rhumba_beat/stage_act()
 	..()
 	if(affected_mob.ckey == "rosham")
->>>>>>> db0c10e... Refactors virus spreading (#31066)
 		cure()
-		return
-	switch(stage)
-		if(2)
-			if(prob(45))
-				affected_mob.adjustToxLoss(5)
-				affected_mob.updatehealth()
-			if(prob(1))
-				to_chat(affected_mob, "<span class='danger'>You feel strange...</span>")
-		if(3)
-			if(prob(5))
-				to_chat(affected_mob, "<span class='danger'>You feel the urge to dance...</span>")
-			else if(prob(5))
-				affected_mob.emote("gasp")
-			else if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You feel the need to chick chicky boom...</span>")
-		if(4)
-			if(prob(10))
-				affected_mob.emote("gasp")
-				to_chat(affected_mob, "<span class='danger'>You feel a burning beat inside...</span>")
-			if(prob(20))
-				affected_mob.adjustToxLoss(5)
-				affected_mob.updatehealth()
-		if(5)
-			to_chat(affected_mob, "<span class='danger'>Your body is unable to contain the Rhumba Beat...</span>")
-			if(prob(50))
-				affected_mob.gib()
-		else
-			return
+		return
+	switch(stage)
+		if(2)
+			if(prob(45))
+				affected_mob.adjustToxLoss(5)
+				affected_mob.updatehealth()
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>You feel strange...</span>")
+		if(3)
+			if(prob(5))
+				to_chat(affected_mob, "<span class='danger'>You feel the urge to dance...</span>")
+			else if(prob(5))
+				affected_mob.emote("gasp")
+			else if(prob(10))
+				to_chat(affected_mob, "<span class='danger'>You feel the need to chick chicky boom...</span>")
+		if(4)
+			if(prob(10))
+				affected_mob.emote("gasp")
+				to_chat(affected_mob, "<span class='danger'>You feel a burning beat inside...</span>")
+			if(prob(20))
+				affected_mob.adjustToxLoss(5)
+				affected_mob.updatehealth()
+		if(5)
+			to_chat(affected_mob, "<span class='danger'>Your body is unable to contain the Rhumba Beat...</span>")
+			if(prob(50))
+				affected_mob.gib()
+		else
+			return