Stripe, and fixed other conflicts