resolve conflicts for mailer