started stykes on _card
fixing merge conflicts