diff --git a/code/modules/events/anomaly_vortex.dm b/code/modules/events/anomaly_vortex.dm
index f25c59304d..9fb75af002 100644
--- a/code/modules/events/anomaly_vortex.dm
+++ b/code/modules/events/anomaly_vortex.dm
@@ -1,24 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/anomaly/anomaly_vortex
-	name = "Anomaly: Vortex"
-	typepath = /datum/round_event/anomaly/anomaly_vortex
-
-	min_players = 20
-	max_occurrences = 2
-	weight = 5
-
-/datum/round_event/anomaly/anomaly_vortex
-	startWhen = 10
-	announceWhen = 3
-
-/datum/round_event/anomaly/anomaly_vortex/announce()
-	priority_announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert")
-
-/datum/round_event/anomaly/anomaly_vortex/start()
-	var/turf/T = safepick(get_area_turfs(impact_area))
-	if(T)
-		newAnomaly = new /obj/effect/anomaly/bhole(T)
-=======
 /datum/round_event_control/anomaly/anomaly_vortex
 	name = "Anomaly: Vortex"
 	typepath = /datum/round_event/anomaly/anomaly_vortex
@@ -38,4 +17,3 @@
 	var/turf/T = safepick(get_area_turfs(impact_area))
 	if(T)
 		newAnomaly = new /obj/effect/anomaly/bhole(T)
->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)