set up stripe
fix merge conflict