redesign the card images
solve merge confliction