Panning cardDeck added
fixed merge conflict