diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 2cb59f2c8e..48dab29cf6 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -294,20 +294,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Species
 	var/species_id
 	S["species"]			>> species_id
-<<<<<<< HEAD
-	var/list/roundstart_races = CONFIG_GET(keyed_flag_list/roundstart_races)
-	if(species_id && (species_id in roundstart_races) && CONFIG_GET(flag/join_with_mutant_race))
-		var/newtype = GLOB.species_list[species_id]
-		pref_species = new newtype()
-	else if (roundstart_races.len)
-		var/rando_race = pick(roundstart_races)
-		if (rando_race)
-			pref_species = new rando_race()
-=======
 	if(species_id)
 		var/newtype = GLOB.species_list[species_id]
 		pref_species = new newtype()
->>>>>>> 360fbff... Fixes losing species preferences (#32093)
 
 	if(!S["features["mcolor"]"] || S["features["mcolor"]"] == "#000")
 		WRITE_FILE(S["features["mcolor"]"]	, "#FFF")