Almost ready to send emails
Resolve conflicts