Update overmind.dm

code/game/gamemodes/blob/overmind.dm

@@ -53,9 +53,6 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 
 	SSshuttle.registerHostileEnvironment(src)
 
-<<<<<<< HEAD
-	.= ..()
-=======
 /mob/camera/blob/proc/validate_location()
 	var/turf/T = get_turf(src)
 	var/area/A = get_area(T)
@@ -64,7 +61,6 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 	if(!T)
 		CRASH("No blobspawnpoints and blob spawned in nullspace.")
 	forceMove(T)
->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
 
 /mob/camera/blob/Life()
 	if(!blob_core)
@@ -84,12 +80,9 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 		max_blob_points = INFINITY
 		blob_points = INFINITY
 		addtimer(CALLBACK(src, .proc/victory), 450)
-<<<<<<< HEAD
-=======
 
 	if(!victory_in_progress && max_count < blobs_legit.len)
 		max_count = blobs_legit.len
->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
 	..()