diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 70806b9c462..88085aa97cc 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -1085,15 +1085,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 
 	else if(href_list["ear_style"])
 		// Construct the list of names allowed for this user.
-<<<<<<< HEAD
-		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) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, user))	//VOREStation Edit
-				pretty_ear_styles[instance.name] = path
-=======
 		var/list/pretty_ear_styles = get_ear_styles()
->>>>>>> a083c7a... Sanitizes languages, ears/wings/tail prefs on login (#8030)
 
 		// Present choice to user
 		var/new_ear_style = input(user, "Pick ears", "Character Preference", pref.ear_style) as null|anything in pretty_ear_styles
@@ -1131,15 +1123,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 
 	else if(href_list["tail_style"])
 		// Construct the list of names allowed for this user.
-<<<<<<< HEAD
-		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) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, user))	//VOREStation Edit
-				pretty_tail_styles[instance.name] = path
-=======
 		var/list/pretty_tail_styles = get_tail_styles()
->>>>>>> a083c7a... Sanitizes languages, ears/wings/tail prefs on login (#8030)
 
 		// Present choice to user
 		var/new_tail_style = input(user, "Pick tails", "Character Preference", pref.tail_style) as null|anything in pretty_tail_styles
@@ -1177,15 +1161,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 
 	else if(href_list["wing_style"])
 		// Construct the list of names allowed for this user.
-<<<<<<< HEAD
-		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) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, user))	//VOREStation Edit
-				pretty_wing_styles[instance.name] = path
-=======
 		var/list/pretty_wing_styles = get_wing_styles()
->>>>>>> a083c7a... Sanitizes languages, ears/wings/tail prefs on login (#8030)
 
 		// Present choice to user
 		var/new_wing_style = input(user, "Pick wings", "Character Preference", pref.wing_style) as null|anything in pretty_wing_styles
@@ -1320,7 +1296,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	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))
+		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
 
@@ -1328,7 +1304,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	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))
+		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
 
@@ -1336,6 +1312,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	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))
+		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
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 3cb6be65c63..cb2b3cf0b34 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -83,11 +83,7 @@
 		S.cd = "/character[default_slot]"
 		player_setup.save_character(S)
 
-<<<<<<< HEAD
-	player_setup.load_character(S)
-	clear_character_previews() // Recalculate them on next show
-=======
->>>>>>> a083c7a... Sanitizes languages, ears/wings/tail prefs on login (#8030)
+	clear_character_previews() // VOREStation Edit
 	return 1
 
 /datum/preferences/proc/save_character()