Updates for adding merchant cards, selecting ship address