diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm
index 6fc129bee1..ca6cd782fc 100644
--- a/code/modules/events/carp_migration.dm
+++ b/code/modules/events/carp_migration.dm
@@ -1,33 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/carp_migration
-	name = "Carp Migration"
-	typepath = /datum/round_event/carp_migration
-	weight = 15
-	min_players = 2
-	earliest_start = 6000
-	max_occurrences = 6
-
-/datum/round_event/carp_migration
-	announceWhen	= 3
-	startWhen = 50
-
-/datum/round_event/carp_migration/setup()
-	startWhen = rand(40, 60)
-
-/datum/round_event/carp_migration/announce()
-	priority_announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
-
-
-/datum/round_event/carp_migration/start()
-	for(var/obj/effect/landmark/C in GLOB.landmarks_list)
-		if(C.name == "carpspawn")
-			if(prob(95))
-				new /mob/living/simple_animal/hostile/carp(C.loc)
-			else
-				new /mob/living/simple_animal/hostile/carp/megacarp(C.loc)
-
-
-=======
 /datum/round_event_control/carp_migration
 	name = "Carp Migration"
 	typepath = /datum/round_event/carp_migration
@@ -53,6 +23,3 @@
 			new /mob/living/simple_animal/hostile/carp(C.loc)
 		else
 			new /mob/living/simple_animal/hostile/carp/megacarp(C.loc)
-
-
->>>>>>> 3358cbb... Cleans up some antag/event landmark checks (#31129)