stripe integration
fixed merge conflicts