diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 314f549e92e..f6223e5f9d2 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -40,19 +40,13 @@
 	throw_speed = 4
 	throw_range = 20
 
-<<<<<<< HEAD
 /obj/item/weapon/soap/nanotrasen
-	desc = "A NanoTrasen-brand bar of soap. Smells of phoron."
-=======
-/obj/item/soap/nanotrasen
 	desc = "A NanoTrasen-brand bar of soap. Smells of phoron, a years-old marketing gimmick."
->>>>>>> a4b3804617d... Merge pull request #8726 from Cerebulon/sope
 	icon_state = "soapnt"
 
 /obj/item/weapon/soap/deluxe
 	icon_state = "soapdeluxe"
 
-<<<<<<< HEAD
 /obj/item/weapon/soap/deluxe/New()
 	desc = "A deluxe Waffle Co. brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]."
 	..()
@@ -61,94 +55,83 @@
 	desc = "An untrustworthy bar of soap. Smells of fear."
 	icon_state = "soapsyndie"
 
-/obj/item/weapon/bikehorn
-=======
-/obj/item/soap/deluxe/Initialize()
-	desc = "A deluxe NanoLux brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]."
-	. = ..()
-
-/obj/item/soap/syndie
+/obj/item/weapon/soap/syndie
 	desc = "An dubious bar of soap. Smells of lyes."
 	icon_state = "soapsyndie"
 
-/obj/item/soap/space_soap
+/obj/item/weapon/soap/space_soap
 	desc = "Smells like hot metal and walnuts."
 	icon_state = "space_soap"
 
-/obj/item/soap/water_soap
+/obj/item/weapon/soap/water_soap
 	desc = "Smells like chlorine."
 	icon_state = "water_soap"
 
-/obj/item/soap/fire_soap
+/obj/item/weapon/soap/fire_soap
 	desc = "Smells like a campfire."
 	icon_state = "fire_soap"
 
-/obj/item/soap/rainbow_soap
+/obj/item/weapon/soap/rainbow_soap
 	desc = "Smells sickly sweet."
 	icon_state = "rainbow_soap"
 
-/obj/item/soap/diamond_soap
+/obj/item/weapon/soap/diamond_soap
 	desc = "Smells like saffron and vanilla."
 	icon_state = "diamond_soap"
 
-/obj/item/soap/uranium_soap
+/obj/item/weapon/soap/uranium_soap
 	desc = "Smells not great... Not terrible."
 	icon_state = "uranium_soap"
 
-/obj/item/soap/silver_soap
+/obj/item/weapon/soap/silver_soap
 	desc = "Smells like birch and amaranth."
 	icon_state = "silver_soap"
 
-/obj/item/soap/brown_soap
+/obj/item/weapon/soap/brown_soap
 	desc = "Smells like cinnamon and cognac."
 	icon_state = "brown_soap"
 
-/obj/item/soap/white_soap
+/obj/item/weapon/soap/white_soap
 	desc = "Smells like nutmeg and oats."
 	icon_state = "white_soap"
 
-/obj/item/soap/grey_soap
+/obj/item/weapon/soap/grey_soap
 	desc = "Smells like bergamot and lilies."
 	icon_state = "grey_soap"
 
-/obj/item/soap/pink_soap
+/obj/item/weapon/soap/pink_soap
 	desc = "Smells like bubblegum."
 	icon_state = "pink_soap"
 
-/obj/item/soap/purple_soap
+/obj/item/weapon/soap/purple_soap
 	desc = "Smells like lavender."
 	icon_state = "purple_soap"
 
-/obj/item/soap/blue_soap
+/obj/item/weapon/soap/blue_soap
 	desc = "Smells like cardamom."
 	icon_state = "blue_soap"
 
-/obj/item/soap/cyan_soap
+/obj/item/weapon/soap/cyan_soap
 	desc = "Smells like bluebells and peaches."
 	icon_state = "cyan_soap"
 
-/obj/item/soap/green_soap
+/obj/item/weapon/soap/green_soap
 	desc = "Smells like a freshly mowed lawn."
 	icon_state = "green_soap"
 
-/obj/item/soap/yellow_soap
+/obj/item/weapon/soap/yellow_soap
 	desc = "Smells like citron and ginger."
 	icon_state = "yellow_soap"
 
-/obj/item/soap/orange_soap
+/obj/item/weapon/soap/orange_soap
 	desc = "Smells like oranges and dark chocolate."
 	icon_state = "orange_soap"
 
-/obj/item/soap/red_soap
+/obj/item/weapon/soap/red_soap
 	desc = "Smells like cherries."
 	icon_state = "red_soap"
 
-/obj/item/soap/golden_soap
-	desc = "Smells like honey."
-	icon_state = "golden_soap"
-
-/obj/item/bikehorn
->>>>>>> a4b3804617d... Merge pull request #8726 from Cerebulon/sope
+/obj/item/weapon/bikehorn
 	name = "bike horn"
 	desc = "A horn off of a bicycle."
 	icon = 'icons/obj/items.dmi'
@@ -489,11 +472,8 @@
 			continue
 		remove_from_storage(B, T)
 
-<<<<<<< HEAD
+
 /obj/item/weapon/stock_parts
-=======
-/obj/item/stock_parts
->>>>>>> a4b3804617d... Merge pull request #8726 from Cerebulon/sope
 	name = "stock part"
 	desc = "What?"
 	gender = PLURAL