Handle mailer asynchronously
Resolve merge conflicts