Updated Roof to Stripe conflicts