diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 8f187397b0f..208e1e1ffc6 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -44,11 +44,7 @@
 
 	var/age = 30		//Player's age (pure fluff)
 	var/b_type = "A+"	//Player's bloodtype
-<<<<<<< HEAD
-	var/datum/robolimb/synthetic		//If they are a synthetic (aka synthetic torso)
-=======
 	var/datum/robolimb/synthetic		//If they are a synthetic (aka synthetic torso). Also holds the datum for the type of robolimb.
->>>>>>> 68b370b... Fresh Meat, Leatherworking (#7629)
 
 	var/list/all_underwear = list()
 	var/list/all_underwear_metadata = list()
@@ -119,9 +115,6 @@
 	var/mob/living/carbon/human/vr_link = null
 
 	var/obj/machinery/machine_visual //machine that is currently applying visual effects to this mob. Only used for camera monitors currently.
-<<<<<<< HEAD
 
 	inventory_panel_type = /datum/inventory_panel/human
-=======
 	butchery_loot = list(/obj/item/stack/animalhide/human = 1)
->>>>>>> 68b370b... Fresh Meat, Leatherworking (#7629)