diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 66731fbba12..15f079d31cb 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -1300,30 +1300,3 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	dat += "</center></body>"
 
 	user << browse(dat, "window=species;size=700x400")
-<<<<<<< HEAD
-
-/datum/category_item/player_setup_item/general/body/proc/get_tail_styles()
-	var/list/pretty_tail_styles = list("Normal" = null)
-	for(var/path in tail_styles_list)
-		var/datum/sprite_accessory/tail/instance = tail_styles_list[path]
-		if(((!instance.ckeys_allowed) || (pref.client.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, pref.client))	//VOREStation Edit
-			pretty_tail_styles[instance.name] = path
-	return pretty_tail_styles
-
-/datum/category_item/player_setup_item/general/body/proc/get_ear_styles()
-	var/list/pretty_ear_styles = list("Normal" = null)
-	for(var/path in ear_styles_list)
-		var/datum/sprite_accessory/ears/instance = ear_styles_list[path]
-		if(((!instance.ckeys_allowed) || (pref.client.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, pref.client))	//VOREStation Edit
-			pretty_ear_styles[instance.name] = path
-	return pretty_ear_styles
-
-/datum/category_item/player_setup_item/general/body/proc/get_wing_styles()
-	var/list/pretty_wing_styles = list("Normal" = null)
-	for(var/path in wing_styles_list)
-		var/datum/sprite_accessory/wing/instance = wing_styles_list[path]
-		if(((!instance.ckeys_allowed) || (pref.client.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, pref.client))	//VOREStation Edit
-			pretty_wing_styles[instance.name] = path
-	return pretty_wing_styles
-=======
->>>>>>> 4b4e976... Merge pull request #8057 from MistakeNot4892/styles