update mailer
fix merge
merge conflict
Merge branch 'main-pages'