diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm
index 6670bfbfa7..c9c8504955 100644
--- a/code/game/machinery/computer/telecrystalconsoles.dm
+++ b/code/game/machinery/computer/telecrystalconsoles.dm
@@ -154,14 +154,9 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 
 /obj/machinery/computer/telecrystals/boss/proc/getDangerous()//This scales the TC assigned with the round population.
 	..()
-<<<<<<< HEAD
-	var/danger = GLOB.joined_player_list.len - SSticker.mode.syndicates.len
-	danger = Ceiling(danger, 10)
-=======
 	var/list/nukeops = get_antagonists(/datum/antagonist/nukeop)
 	var/danger = GLOB.joined_player_list.len - nukeops.len
 	danger = CEILING(danger, 10)
->>>>>>> 25080ff... defines math (#33498)
 	scaleTC(danger)
 
 /obj/machinery/computer/telecrystals/boss/proc/scaleTC(amt)//Its own proc, since it'll probably need a lot of tweaks for balance, use a fancier algorhithm, etc.
@@ -229,4 +224,4 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	src.updateUsrDialog()
 	return
 
-#undef NUKESCALINGMODIFIER
\ No newline at end of file
+#undef NUKESCALINGMODIFIER