diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 572ae2a68c3..caf5ae74c38 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -267,11 +267,7 @@
 	color = reagents.get_color()
 	update_icon()
 
-<<<<<<< HEAD
-/obj/item/weapon/storage/box/pocky //ADDITION 04/17/2021
-=======
-/obj/item/storage/box/pocky
->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962)
+/obj/item/weapon/storage/box/pocky
 	name = "\improper Totemo yoi Pocky"
 	desc = "A bundle of chocolate-coated bisquit sticks."
 	icon = 'icons/obj/food_snacks.dmi'