diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 9e72a1eaad..06ee810bc0 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -1,53 +1,3 @@
-<<<<<<< HEAD
-/mob/living/carbon/human
-	hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD)
-	possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
-	pressure_resistance = 25
-	//Hair colour and style
-	var/hair_color = "000"
-	var/hair_style = "Bald"
-
-	//Facial hair colour and style
-	var/facial_hair_color = "000"
-	var/facial_hair_style = "Shaved"
-
-	//Eye colour
-	var/eye_color = "000"
-
-	var/skin_tone = "caucasian1"	//Skin tone
-
-	var/lip_style = null	//no lipstick by default- arguably misleading, as it could be used for general makeup
-	var/lip_color = "white"
-
-	var/age = 30		//Player's age (pure fluff)
-
-	var/underwear = "Nude"	//Which underwear the player wants
-	var/undershirt = "Nude" //Which undershirt the player wants
-	var/socks = "Nude" //Which socks the player wants
-	var/backbag = DBACKPACK		//Which backpack type the player has chosen.
-
-	//Equipment slots
-	var/obj/item/wear_suit = null
-	var/obj/item/w_uniform = null
-	var/obj/item/belt = null
-	var/obj/item/wear_id = null
-	var/obj/item/r_store = null
-	var/obj/item/l_store = null
-	var/obj/item/s_store = null
-
-	var/special_voice = "" // For changing our voice. Used by a symptom.
-
-	var/bleed_rate = 0 //how much are we bleeding
-	var/bleedsuppress = 0 //for stopping bloodloss, eventually this will be limb-based like bleeding
-
-	var/name_override //For temporary visible name changes
-
-	var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects
-	var/datum/personal_crafting/handcrafting
-	can_buckle = TRUE
-	buckle_lying = FALSE
-	can_ride_typecache = list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot)
-=======
 /mob/living/carbon/human
 	hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD)
 	possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
@@ -97,5 +47,4 @@
 	buckle_lying = FALSE
 	can_ride_typecache = list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot)
 
-	var/creamed = FALSE //to use with creampie overlays
->>>>>>> 4b06c5c... Prevent creampie overlays from stacking. (#31750)
+	var/creamed = FALSE //to use with creampie overlays