diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index e8be8e6d2c..33a74256ed 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -46,13 +46,8 @@
 		/obj/item/toy/eightball									= 2,
 		/obj/item/toy/windupToolbox								= 2,
 		/obj/item/toy/clockwork_watch							= 2,
-<<<<<<< HEAD
-		/obj/item/extendohand/acme								= 1)
-=======
 		/obj/item/toy/toy_dagger								= 2,
-		/obj/item/extendohand/acme								= 1,
-		/obj/item/hot_potato/harmless/toy						= 1)
->>>>>>> ed01b8c... Toy Daggers! (#35352)
+		/obj/item/extendohand/acme								= 1)
 
 	light_color = LIGHT_COLOR_GREEN