cards in deck
fixing merges:
merge
pretty close