stripe checkout feature
fix conflicts