diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm
index 9b5585f7b1..3199cc369a 100644
--- a/code/game/gamemodes/blob/overmind.dm
+++ b/code/game/gamemodes/blob/overmind.dm
@@ -63,10 +63,6 @@
 				place_blob_core(base_point_rate, 1)
 		else
 			qdel(src)
-<<<<<<< HEAD
-	..()
-
-=======
 	else if(!victory_in_progress && (blobs_legit.len >= blobwincount))
 		victory_in_progress = TRUE
 		priority_announce("Biohazard has reached critical mass. Station loss is imminent.", "Biohazard Alert")
@@ -112,7 +108,6 @@
 	SSticker.news_report = BLOB_WIN
 	SSticker.force_ending = 1
 
->>>>>>> 7034a22... Blob fixes (#31913)
 /mob/camera/blob/Destroy()
 	for(var/BL in GLOB.blobs)
 		var/obj/structure/blob/B = BL