decks and their cards can be deleted or updated
Resolved merge conflicts