fixes merge conflict

code/modules/client/client procs.dm

@@ -326,7 +326,7 @@
 		preload_rsc = pick(config.resource_urls)
 	else preload_rsc = 1 // If config.resource_urls is not set, preload like normal.
 
-	to_chat(src, "\red If the title screen is black, resources are still downloading. Please be patient until the title screen appears.")
+	to_chat(src, "<span class='warning'>If the title screen is black, resources are still downloading. Please be patient until the title screen appears.</span>")
 
 
 	clients += src

code/modules/client/preference/loadout/loadout_hat.dm

@@ -118,6 +118,11 @@
 	path = /obj/item/clothing/head/beret/sci
 	allowed_roles = list("Research Director", "Scientist")
 
+/datum/gear/hat/med_beret
+	display_name = "medical beret"
+	path = /obj/item/clothing/head/beret/med
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Brig Physician")
+
 /datum/gear/hat/surgicalcap_purple
 	display_name = "surgical cap, purple"
 	path = /obj/item/clothing/head/surgery/purple

code/modules/client/preference/loadout/loadout_uniform.dm

@@ -50,7 +50,7 @@
 
 /datum/gear/uniform/skirt/job/cmo
 	display_name = "skirt, cmo"
-	path = /obj/item/clothing/under/rank/chief_medical_officer
+	path = /obj/item/clothing/under/rank/chief_medical_officer/skirt
 	allowed_roles = list("Chief Medical Officer")
 
 /datum/gear/uniform/skirt/job/chem

code/modules/client/preference/preferences.dm

@@ -788,7 +788,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		return
 
 	if(!isnum(desiredLvl))
-		to_chat(user, "\red UpdateJobPreference - desired level was not a number. Please notify coders!")
+		to_chat(user, "<span class='warning'>UpdateJobPreference - desired level was not a number. Please notify coders!</span>")
 		ShowChoices(user)
 		return