Fix merge conflict.
Remove shipping address (Stripe doesn’t store it).