diff --git a/code/modules/events/anomaly_grav.dm b/code/modules/events/anomaly_grav.dm
index 304e53a8f9..6c4fa46b6c 100644
--- a/code/modules/events/anomaly_grav.dm
+++ b/code/modules/events/anomaly_grav.dm
@@ -1,22 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/anomaly/anomaly_grav
-	name = "Anomaly: Gravitational"
-	typepath = /datum/round_event/anomaly/anomaly_grav
-	max_occurrences = 5
-	weight = 20
-
-/datum/round_event/anomaly/anomaly_grav
-	startWhen = 3
-	announceWhen = 20
-
-/datum/round_event/anomaly/anomaly_grav/announce()
-	priority_announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
-
-/datum/round_event/anomaly/anomaly_grav/start()
-	var/turf/T = safepick(get_area_turfs(impact_area))
-	if(T)
-		newAnomaly = new /obj/effect/anomaly/grav(T)
-=======
 /datum/round_event_control/anomaly/anomaly_grav
 	name = "Anomaly: Gravitational"
 	typepath = /datum/round_event/anomaly/anomaly_grav
@@ -34,4 +15,3 @@
 	var/turf/T = safepick(get_area_turfs(impact_area))
 	if(T)
 		newAnomaly = new /obj/effect/anomaly/grav(T)
->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)