add mailer
fix conflict