diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 6e598c933e1..411cf025d44 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -112,20 +112,11 @@
 	name = "Antenna"
 	icon_state = "hair_antenna"
 
-<<<<<<< HEAD
-=======
-/datum/sprite_accessory/hair/astolfo
-	name = "Astolfo"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "hair_astolfo"
-
 /datum/sprite_accessory/hair/averagejoe
 	name = "Average Joe"
 	icon_state = "hair_averagejoe"
 	flags = HAIR_VERY_SHORT
 
->>>>>>> 24ffdc3... Merge pull request #7861 from Schnayy/hairport
 /datum/sprite_accessory/hair/bald
 	name = "Bald"
 	icon_state = "bald"
@@ -853,25 +844,6 @@
 	icon_state = "hair_ponytail6"
 	flags = HAIR_TIEABLE|HAIR_VERY_SHORT
 
-<<<<<<< HEAD
-=======
-/datum/sprite_accessory/hair/ponytail6_fixed ////// ??????????????? I'm afraid to touch this because save files but this doesn't actually do anything.
-	name = "Ponytail 6.2"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "hair_ponytail6"
-
-/datum/sprite_accessory/hair/highponytail
-	name = "Ponytail High"
-	icon_state = "hair_highponytail"
-	flags = HAIR_TIEABLE
-
-/datum/sprite_accessory/hair/jeanponytail
-	name = "Ponytail, Jean"
-	icon_state = "hair_jeanponytail"
-	flags = HAIR_TIEABLE
-
->>>>>>> 24ffdc3... Merge pull request #7861 from Schnayy/hairport
 /datum/sprite_accessory/hair/sharpponytail
 	name = "Ponytail Sharp"
 	icon_state = "hair_sharpponytail"
@@ -1002,20 +974,6 @@
 	icon_state = "hair_shorthair4"
 	flags = HAIR_VERY_SHORT
 
-<<<<<<< HEAD
-=======
-/datum/sprite_accessory/hair/awoohair
-	name = "Shoulder-length Messy"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "momijihair"
-
-/datum/sprite_accessory/hair/shouldersweep
-	name = "Shoulder Sweep"
-	icon_state = "hair_shouldersweep"
-	flags = HAIR_TIEABLE
-
->>>>>>> 24ffdc3... Merge pull request #7861 from Schnayy/hairport
 /datum/sprite_accessory/hair/shy
 	name = "Shy"
 	icon_state = "hair_shy"
@@ -1206,325 +1164,6 @@
 	icon_state = "hair_ziegler"
 	flags = HAIR_TIEABLE
 
-<<<<<<< HEAD
-=======
-/datum/sprite_accessory/hair/una_hood
-	name = "Cobra Hood"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "soghun_hood"
-	species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-
-/datum/sprite_accessory/hair/una_doublehorns
-	name = "Double Unathi Horns"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "soghun_dubhorns"
-	species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-
-/datum/sprite_accessory/hair/sergal_plain
-	name = "Sergal Plain"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "serg_plain"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-
-/datum/sprite_accessory/hair/sergal_medicore
-	name = "Sergal Medicore"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "serg_medicore"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-
-/datum/sprite_accessory/hair/sergal_tapered
-	name = "Sergal Tapered"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "serg_tapered"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-
-/datum/sprite_accessory/hair/sergal_fairytail
-	name = "Sergal Fairytail"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "serg_fairytail"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-
-// Vulpa stuffs
-
-/datum/sprite_accessory/hair/vulp_hair_none
-	name = "None"
-	icon_state = "bald"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_kajam
-	name = "Kajam"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "kajam"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_keid
-	name = "Keid"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "keid"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_adhara
-	name = "Adhara"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "adhara"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_kleeia
-	name = "Kleeia"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "kleeia"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_mizar
-	name = "Mizar"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "mizar"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_apollo
-	name = "Apollo"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "apollo"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_belle
-	name = "Belle"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "belle"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_bun
-	name = "Vulp Bun"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "bun"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_jagged
-	name = "Jagged"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "jagged"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_curl
-	name = "Curl"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "curl"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_hawk
-	name = "Hawk"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "hawk"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_anita
-	name = "Anita"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "anita"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_short
-	name = "Short"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "short"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/vulp_hair_spike
-	name = "Spike"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "spike"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-//xeno stuffs
-/datum/sprite_accessory/hair/xeno_head_drone_color
-	name = "Drone dome"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "cxeno_drone"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-// figure this one out for better coloring
-/datum/sprite_accessory/hair/xeno_head_sentinel_color
-	name = "Sentinal dome"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "cxeno_sentinel"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/xeno_head_queen_color
-	name = "Queen dome"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "cxeno_queen"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/xeno_head_hunter_color
-	name = "Hunter dome"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "cxeno_hunter"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/xeno_head_praetorian_color
-	name = "Praetorian dome"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "cxeno_praetorian"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-// Shadekin stuffs
-
-/datum/sprite_accessory/hair/shadekin_hair_short
-	name = "Shadekin Short Hair"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "shadekin_short"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/shadekin_hair_poofy
-	name = "Shadekin Poofy Hair"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "shadekin_poofy"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/datum/sprite_accessory/hair/shadekin_hair_long
-	name = "Shadekin Long Hair"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_add = 'icons/mob/human_face_alt_add.dmi'
-	icon_state = "shadekin_long"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-
-/*
-shaved
-	name = "Shaved"
-	icon_state = "bald"
-	gender = NEUTER
-	species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-*/
-/datum/sprite_accessory/facial_hair/neck_fluff
-	name = "Neck Fluff"
-	icon = 'icons/mob/human_face_or_alt.dmi'
-	icon_state = "facial_neckfluff"
-	gender = NEUTER
-	species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_none
-	name = "None"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "none"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_blaze
-	name = "Blaze"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "vulp_facial_blaze"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_vulpine
-	name = "Vulpine"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "vulp_facial_vulpine"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_earfluff
-	name = "Earfluff"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "vulp_facial_earfluff"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_mask
-	name = "Mask"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "vulp_facial_mask"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_patch
-	name = "Patch"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "vulp_facial_patch"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_ruff
-	name = "Ruff"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "vulp_facial_ruff"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_kita
-	name = "Kita"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "vulp_facial_kita"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/facial_hair/vulp_swift
-	name = "Swift"
-	icon = 'icons/mob/human_face_alt.dmi'
-	icon_state = "vulp_facial_swift"
-	species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
-	gender = NEUTER
-	color_blend_mode = ICON_MULTIPLY
-
->>>>>>> 24ffdc3... Merge pull request #7861 from Schnayy/hairport
 /*
 ///////////////////////////////////
 /  =---------------------------=  /