testing mailer
test stripe
fix merge conflict