diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 2f0b6dc021..759327c544 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -7,13 +7,8 @@
 	subspace_transmission = TRUE
 	canhear_range = 0 // can't hear headsets from very far away
 
-<<<<<<< HEAD
-	slot_flags = SLOT_EARS
-	var/obj/item/device/encryptionkey/keyslot2 = null
-=======
 	slot_flags = ITEM_SLOT_EARS
 	var/obj/item/encryptionkey/keyslot2 = null
->>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
 	dog_fashion = null
 
 /obj/item/device/radio/headset/suicide_act(mob/living/carbon/user)