diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index aa3b44ac74..ca92e30b1d 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -116,22 +116,6 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"ABSTRACT_1" = ABSTRACT_1,
 		"NODECONSTRUCT_1" = NODECONSTRUCT_1,
 		"OVERLAY_QUEUED_1" = OVERLAY_QUEUED_1,
-<<<<<<< HEAD
-		"NOSLIP_1" = NOSLIP_1
-		),
-	"flags_2" = list(
-		"SLOWS_WHILE_IN_HAND_2" = SLOWS_WHILE_IN_HAND_2,
-		"NO_EMP_WIRES_2" = NO_EMP_WIRES_2,
-		"HOLOGRAM_2" = HOLOGRAM_2,
-		"FRONZE_2" = FROZEN_2,
-		"BANG_PROTECT_2" = BANG_PROTECT_2,
-		"HEALS_EARS_2" = HEALS_EARS_2,
-		"OMNITONGUE_2" = OMNITONGUE_2,
-		"TESLA_IGNORE_2" = TESLA_IGNORE_2,
-		"NO_MAT_REDEMPTION_2" = NO_MAT_REDEMPTION_2,
-		"LAVA_PROTECT_2" = LAVA_PROTECT_2
-		)
-=======
 		"NO_EMP_WIRES_1" = NO_EMP_WIRES_1,
 		"HOLOGRAM_1" = HOLOGRAM_1,
 		"TESLA_IGNORE_1" = TESLA_IGNORE_1
@@ -144,5 +128,4 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"NOSLIP" = NOSLIP,
 		"THICKMATERIAL" = THICKMATERIAL,
 	)
->>>>>>> fd4c753... replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2  (#37597)
 	))