diff --git a/code/modules/client/stored_item.dm b/code/modules/client/stored_item.dm
index bff1ec3953..88dbbe2ee8 100644
--- a/code/modules/client/stored_item.dm
+++ b/code/modules/client/stored_item.dm
@@ -250,10 +250,7 @@
 	persist_storable = FALSE
 /obj/item/weapon/rcd
 	persist_storable = FALSE
-<<<<<<< HEAD
-=======
 /obj/item/weapon/spacecash
 	persist_storable = FALSE
 /obj/item/weapon/spacecasinocash
 	persist_storable = FALSE
->>>>>>> e5ae85f667... Merge pull request #13536 from Heroman3003/casino-changes