set up stripe
fix merge conflict
fixed login modal
fix merge conflict
fixed merge conflict