diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 9b633b8b6b..d3d8ec086e 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -157,24 +157,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	character.g_synth	= pref.g_synth
 	character.b_synth	= pref.b_synth
 	character.synth_markings = pref.synth_markings
-<<<<<<< HEAD
-	if(pref.species == "Grey")//YWadd START
-		character.wingdings = pref.wingdings
-
-	if(pref.colorblind_mono == 1)
-		character.add_modifier(/datum/modifier/trait/colorblind_monochrome)
-
-	else if(pref.colorblind_vulp == 1)
-		character.add_modifier(/datum/modifier/trait/colorblind_vulp)
-
-	else if(pref.colorblind_taj == 1)
-		character.add_modifier(/datum/modifier/trait/colorblind_taj)
-
-	if(pref.haemophilia == 1)
-		character.add_modifier(/datum/modifier/trait/haemophilia)
-	//YWadd END
-||||||| parent of 039ede55fe... Merge pull request #9539 from VOREStation/upstream-merge-7813
-=======
 	character.ear_style			= ear_styles_list[pref.ear_style]
 	character.r_ears	= pref.r_ears
 	character.b_ears	= pref.b_ears
@@ -197,7 +179,22 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	character.b_wing2	= pref.b_wing2
 	character.g_wing2	= pref.g_wing2
 	character.set_gender( pref.biological_gender)
->>>>>>> 039ede55fe... Merge pull request #9539 from VOREStation/upstream-merge-7813
+	
+	if(pref.species == "Grey")//YWadd START
+		character.wingdings = pref.wingdings
+
+	if(pref.colorblind_mono == 1)
+		character.add_modifier(/datum/modifier/trait/colorblind_monochrome)
+
+	else if(pref.colorblind_vulp == 1)
+		character.add_modifier(/datum/modifier/trait/colorblind_vulp)
+
+	else if(pref.colorblind_taj == 1)
+		character.add_modifier(/datum/modifier/trait/colorblind_taj)
+
+	if(pref.haemophilia == 1)
+		character.add_modifier(/datum/modifier/trait/haemophilia)
+	//YWadd END	
 
 	// Destroy/cyborgize organs and limbs.
 	for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))