added mailer
resolved confilct
add test for mailer