diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm
index caabe39336..303bc54b65 100644
--- a/code/datums/diseases/retrovirus.dm
+++ b/code/datums/diseases/retrovirus.dm
@@ -1,87 +1,3 @@
-<<<<<<< HEAD
-/datum/disease/dna_retrovirus
-	name = "Retrovirus"
-	max_stages = 4
-	spread_text = "Contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Rest or an injection of mutadone"
-	cure_chance = 6
-	agent = ""
-	viable_mobtypes = list(/mob/living/carbon/human)
-	desc = "A DNA-altering retrovirus that scrambles the structural and unique enzymes of a host constantly."
-	severity = DANGEROUS
-	permeability_mod = 0.4
-	stage_prob = 2
-	var/SE
-	var/UI
-	var/restcure = 0
-
-
-/datum/disease/dna_retrovirus/New()
-	..()
-	agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
-	if(prob(40))
-		cures = list("mutadone")
-	else
-		restcure = 1
-
-
-/datum/disease/dna_retrovirus/stage_act()
-	..()
-	switch(stage)
-		if(1)
-			if(restcure)
-				if(affected_mob.lying && prob(30))
-					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-					cure()
-					return
-			if (prob(8))
-				to_chat(affected_mob, "<span class='danger'>Your head hurts.</span>")
-			if (prob(9))
-				to_chat(affected_mob, "You feel a tingling sensation in your chest.")
-			if (prob(9))
-				to_chat(affected_mob, "<span class='danger'>You feel angry.</span>")
-		if(2)
-			if(restcure)
-				if(affected_mob.lying && prob(20))
-					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-					cure()
-					return
-			if (prob(8))
-				to_chat(affected_mob, "<span class='danger'>Your skin feels loose.</span>")
-			if (prob(10))
-				to_chat(affected_mob, "You feel very strange.")
-			if (prob(4))
-				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head!</span>")
-				affected_mob.Unconscious(40)
-			if (prob(4))
-				to_chat(affected_mob, "<span class='danger'>Your stomach churns.</span>")
-		if(3)
-			if(restcure)
-				if(affected_mob.lying && prob(20))
-					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-					cure()
-					return
-			if (prob(10))
-				to_chat(affected_mob, "<span class='danger'>Your entire body vibrates.</span>")
-
-			if (prob(35))
-				if(prob(50))
-					scramble_dna(affected_mob, 1, 0, rand(15,45))
-				else
-					scramble_dna(affected_mob, 0, 1, rand(15,45))
-
-		if(4)
-			if(restcure)
-				if(affected_mob.lying && prob(5))
-					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
-					cure()
-					return
-			if (prob(60))
-				if(prob(50))
-					scramble_dna(affected_mob, 1, 0, rand(50,75))
-				else
-=======
 /datum/disease/dna_retrovirus
 	name = "Retrovirus"
 	max_stages = 4
@@ -164,5 +80,4 @@
 				if(prob(50))
 					scramble_dna(affected_mob, 1, 0, rand(50,75))
 				else
->>>>>>> db0c10e... Refactors virus spreading (#31066)
-					scramble_dna(affected_mob, 0, 1, rand(50,75))
\ No newline at end of file
+					scramble_dna(affected_mob, 0, 1, rand(50,75))