added delete functionality for card
fix conflict and merging