diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm
index f66b8df54e..da4eff9f39 100644
--- a/code/modules/events/communications_blackout.dm
+++ b/code/modules/events/communications_blackout.dm
@@ -1,30 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/communications_blackout
-	name = "Communications Blackout"
-	typepath = /datum/round_event/communications_blackout
-	weight = 30
-
-/datum/round_event/communications_blackout
-	announceWhen	= 1
-
-/datum/round_event/communications_blackout/announce()
-	var/alert = pick(	"Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you*%fj00)`5vc-BZZT", \
-						"Ionospheric anomalies detected. Temporary telecommunication failu*3mga;b4;'1v�-BZZZT", \
-						"Ionospheric anomalies detected. Temporary telec#MCi46:5.;@63-BZZZZT", \
-						"Ionospheric anomalies dete'fZ\\kg5_0-BZZZZZT", \
-						"Ionospheri:%� MCayj^j<.3-BZZZZZZT", \
-						"#4nd%;f4y6,>�%-BZZZZZZZT")
-
-	for(var/mob/living/silicon/ai/A in GLOB.ai_list)	//AIs are always aware of communication blackouts.
-		to_chat(A, "<br><span class='warning'><b>[alert]</b></span><br>")
-
-	if(prob(30))	//most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
-		priority_announce(alert)
-
-
-/datum/round_event/communications_blackout/start()
-	for(var/obj/machinery/telecomms/T in GLOB.telecomms_list)
-=======
 /datum/round_event_control/communications_blackout
 	name = "Communications Blackout"
 	typepath = /datum/round_event/communications_blackout
@@ -50,5 +23,4 @@
 
 /datum/round_event/communications_blackout/start()
 	for(var/obj/machinery/telecomms/T in GLOB.telecomms_list)
->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)
 		T.emp_act(EMP_HEAVY)