max 10 cards
fixed merge conflicts