diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm
index 1a505d6261..e62a8b491d 100644
--- a/code/datums/diseases/fake_gbs.dm
+++ b/code/datums/diseases/fake_gbs.dm
@@ -1,37 +1,3 @@
-<<<<<<< HEAD
-/datum/disease/fake_gbs
-	name = "GBS"
-	max_stages = 5
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Synaptizine & Sulfur"
-	cures = list("synaptizine","sulfur")
-	agent = "Gravitokinetic Bipotential SADS-"
-	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
-	desc = "If left untreated death will occur."
-	severity = BIOHAZARD
-
-/datum/disease/fake_gbs/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			if(prob(1))
-				affected_mob.emote("sneeze")
-		if(3)
-			if(prob(5))
-				affected_mob.emote("cough")
-			else if(prob(5))
-				affected_mob.emote("gasp")
-			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
-		if(4)
-			if(prob(10))
-				affected_mob.emote("cough")
-
-		if(5)
-			if(prob(10))
-				affected_mob.emote("cough")
-=======
 /datum/disease/fake_gbs
 	name = "GBS"
 	max_stages = 5
@@ -64,4 +30,3 @@
 		if(5)
 			if(prob(10))
 				affected_mob.emote("cough")
->>>>>>> db0c10e... Refactors virus spreading (#31066)