ready to send mails
conflicts solved