diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm
index ec7822010a..99fb699c9c 100644
--- a/code/modules/research/designs/weapons.dm
+++ b/code/modules/research/designs/weapons.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /datum/design/item/weapon/AssembleDesignName()
 	..()
 	name = "Weapon prototype ([item_name])"