updated card swiping motions
resolved conflicts related to card swipe