fixed bugs with amount of cards and returnCards
merge conflict