diff --git a/code/modules/antagonists/blob/blob/blobs/shield.dm b/code/modules/antagonists/blob/blob/blobs/shield.dm
index 87dcd7bfdf..a83f4294b2 100644
--- a/code/modules/antagonists/blob/blob/blobs/shield.dm
+++ b/code/modules/antagonists/blob/blob/blobs/shield.dm
@@ -1,38 +1,3 @@
-<<<<<<< HEAD
-/obj/structure/blob/shield
-	name = "strong blob"
-	icon = 'icons/mob/blob.dmi'
-	icon_state = "blob_shield"
-	desc = "A solid wall of slightly twitching tendrils."
-	max_integrity = 150
-	brute_resist = 0.25
-	explosion_block = 3
-	point_return = 4
-	atmosblock = TRUE
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90)
-
-/obj/structure/blob/shield/scannerreport()
-	if(atmosblock)
-		return "Will prevent the spread of atmospheric changes."
-	return "N/A"
-
-/obj/structure/blob/shield/core
-	point_return = 0
-
-/obj/structure/blob/shield/update_icon()
-	..()
-	if(obj_integrity <= 75)
-		icon_state = "blob_shield_damaged"
-		name = "weakened strong blob"
-		desc = "A wall of twitching tendrils."
-		atmosblock = FALSE
-	else
-		icon_state = initial(icon_state)
-		name = initial(name)
-		desc = initial(desc)
-		atmosblock = TRUE
-	air_update_turf(1)
-=======
 /obj/structure/blob/shield
 	name = "strong blob"
 	icon = 'icons/mob/blob.dmi'
@@ -66,4 +31,3 @@
 		desc = initial(desc)
 		atmosblock = TRUE
 	air_update_turf(1)
->>>>>>> d282c60... Quote the armor lists (#35668)