diff --git a/code/modules/events/holiday/friday13th.dm b/code/modules/events/holiday/friday13th.dm
index 0dbf8d7ec9..b1db15a896 100644
--- a/code/modules/events/holiday/friday13th.dm
+++ b/code/modules/events/holiday/friday13th.dm
@@ -1,22 +1,3 @@
-<<<<<<< HEAD
-// Basically, cut the event frequency in half to simulate unluckiness.
-
-/datum/round_event_control/fridaythethirteen
-	name = "Friday the 13th"
-	holidayID = FRIDAY_13TH
-	typepath = /datum/round_event/fridaythethirteen
-	weight = -1
-	max_occurrences = 1
-	earliest_start = 0
-
-/datum/round_event/fridaythethirteen/start()
-	//Very unlucky, cut the frequency of events in half.
-	events.frequency_lower /= 2
-	events.frequency_upper /= 2
-
-/datum/round_event/fridaythethirteen/announce()
-	for(var/mob/living/L in player_list)
-=======
 // Basically, cut the event frequency in half to simulate unluckiness.
 
 /datum/round_event_control/fridaythethirteen
@@ -34,5 +15,4 @@
 
 /datum/round_event/fridaythethirteen/announce(fake)
 	for(var/mob/living/L in player_list)
->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)
-		to_chat(L, "<span class='warning'>You are feeling unlucky today.</span>")
\ No newline at end of file
+		to_chat(L, "<span class='warning'>You are feeling unlucky today.</span>")