diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index b985e37bf2..2ff546a6eb 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -1,134 +1,3 @@
-<<<<<<< HEAD
-/obj/item/clothing/under/color
-	desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
-
-/obj/item/clothing/under/color/random/New()
-	..()
-	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random)
-	name = initial(C.name)
-	icon_state = initial(C.icon_state)
-	item_state = initial(C.item_state)
-	item_color = initial(C.item_color)
-
-/obj/item/clothing/under/color/black
-	name = "black jumpsuit"
-	icon_state = "black"
-	item_state = "bl_suit"
-	item_color = "black"
-	resistance_flags = 0
-
-/obj/item/clothing/under/color/black/ghost
-	flags_1 = NODROP_1|DROPDEL_1
-
-/obj/item/clothing/under/color/grey
-	name = "grey jumpsuit"
-	desc = "A tasteful grey jumpsuit that reminds you of the good old days."
-	icon_state = "grey"
-	item_state = "gy_suit"
-	item_color = "grey"
-
-/obj/item/clothing/under/color/grey/glorf
-	name = "ancient jumpsuit"
-	desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."
-
-/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	owner.forcesay(GLOB.hit_appends)
-	return 0
-
-/obj/item/clothing/under/color/blue
-	name = "blue jumpsuit"
-	icon_state = "blue"
-	item_state = "b_suit"
-	item_color = "blue"
-
-/obj/item/clothing/under/color/green
-	name = "green jumpsuit"
-	icon_state = "green"
-	item_state = "g_suit"
-	item_color = "green"
-
-/obj/item/clothing/under/color/orange
-	name = "orange jumpsuit"
-	desc = "Don't wear this near paranoid security officers."
-	icon_state = "orange"
-	item_state = "o_suit"
-	item_color = "orange"
-
-/obj/item/clothing/under/color/pink
-	name = "pink jumpsuit"
-	icon_state = "pink"
-	desc = "Just looking at this makes you feel <i>fabulous</i>."
-	item_state = "p_suit"
-	item_color = "pink"
-
-/obj/item/clothing/under/color/red
-	name = "red jumpsuit"
-	icon_state = "red"
-	item_state = "r_suit"
-	item_color = "red"
-
-/obj/item/clothing/under/color/white
-	name = "white jumpsuit"
-	icon_state = "white"
-	item_state = "w_suit"
-	item_color = "white"
-
-/obj/item/clothing/under/color/yellow
-	name = "yellow jumpsuit"
-	icon_state = "yellow"
-	item_state = "y_suit"
-	item_color = "yellow"
-
-/obj/item/clothing/under/color/darkblue
-	name = "darkblue jumpsuit"
-	icon_state = "darkblue"
-	item_state = "b_suit"
-	item_color = "darkblue"
-
-/obj/item/clothing/under/color/teal
-	name = "teal jumpsuit"
-	icon_state = "teal"
-	item_state = "b_suit"
-	item_color = "teal"
-
-/obj/item/clothing/under/color/lightpurple
-	name = "purple jumpsuit"
-	icon_state = "lightpurple"
-	item_state = "p_suit"
-	item_color = "lightpurple"
-
-/obj/item/clothing/under/color/darkgreen
-	name = "darkgreen jumpsuit"
-	icon_state = "darkgreen"
-	item_state = "g_suit"
-	item_color = "darkgreen"
-
-/obj/item/clothing/under/color/lightbrown
-	name = "lightbrown jumpsuit"
-	icon_state = "lightbrown"
-	item_state = "lb_suit"
-	item_color = "lightbrown"
-
-/obj/item/clothing/under/color/brown
-	name = "brown jumpsuit"
-	icon_state = "brown"
-	item_state = "lb_suit"
-	item_color = "brown"
-
-/obj/item/clothing/under/color/maroon
-	name = "maroon jumpsuit"
-	icon_state = "maroon"
-	item_state = "r_suit"
-	item_color = "maroon"
-
-/obj/item/clothing/under/color/rainbow
-	name = "rainbow jumpsuit"
-	desc = "A multi-colored jumpsuit!"
-	icon_state = "rainbow"
-	item_state = "rainbow"
-	item_color = "rainbow"
-	can_adjust = 0
-=======
 /obj/item/clothing/under/color
 	desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
 
@@ -261,4 +130,3 @@
 	item_state = "rainbow"
 	item_color = "rainbow"
 	can_adjust = FALSE
->>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)