Fix mailer
Fix conflict