diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
index 601df0115f..8dcb6a61e2 100644
--- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
@@ -124,9 +124,6 @@
 
 /datum/gear/eyes/circuitry
 	display_name = "goggles, circuitry (empty)"
-<<<<<<< HEAD
-	path = /obj/item/clothing/glasses/circuitry
-=======
 	path = /obj/item/clothing/glasses/circuitry
 
 /datum/gear/eyes/glasses/rimless
@@ -144,4 +141,3 @@
 /datum/gear/eyes/glasses/prescriptionthin
 	display_name = "Glasses, prescription thin frame"
 	path = /obj/item/clothing/glasses/regular/thin
->>>>>>> e0d442b... Merge pull request #5838 from Cerebulon/glassesfix
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index aa57ae4f72..2230e14603 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -232,8 +232,6 @@ BLIND     // can't see anything
 	item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses")
 	body_parts_covered = 0
 
-<<<<<<< HEAD
-=======
 /obj/item/clothing/glasses/regular/rimless
 	name = "prescription rimless glasses"
 	desc = "Sleek modern glasses with a single sculpted lens."
@@ -258,7 +256,6 @@ BLIND     // can't see anything
 	prescription = 0
 
 
->>>>>>> e0d442b... Merge pull request #5838 from Cerebulon/glassesfix
 /obj/item/clothing/glasses/sunglasses
 	name = "sunglasses"
 	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."