fixed merge conflict in cards page