Stripe conflict fix