diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 70a6f1bdba..76fd5e5cbf 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -26,14 +26,8 @@
 	aSignal = new(src)
 	aSignal.name = "[name] core"
 	aSignal.code = rand(1,100)
-
-<<<<<<< HEAD
-	aSignal.frequency = rand(1200, 1599)
-	if(IsMultiple(aSignal.frequency, 2))//signaller frequencies are always uneven!
-=======
 	aSignal.frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ)
 	if(ISMULTIPLE(aSignal.frequency, 2))//signaller frequencies are always uneven!
->>>>>>> 25080ff... defines math (#33498)
 		aSignal.frequency++
 
 	if(new_lifespan)