getting setup for code manipulation of cards
resolving merge conflicts