pull after stripe
fix merge issue with stripe