diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 313735409f..a5da95cd6a 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -99,13 +99,9 @@
 		/obj/item/weapon/storage/pill_bottle,
 		/obj/item/weapon/reagent_containers/pill,
 		/obj/item/weapon/reagent_containers/blood,
-<<<<<<< HEAD
 		/obj/item/device/nif,       //Chompedit Add Nif handling
-		/obj/item/stack/material/phoron
-=======
 		/obj/item/stack/material/phoron,
 		/obj/item/weapon/disk/body_record //Vorestation Edit: this lets you get an empty sleeve or help someone else
->>>>>>> 88aff386e2... Merge pull request #13556 from TankTheBirb/moretraumafix
 		)
 
 /obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc