Add more conflictive emails.
Merge remote-tracking branch 'refs/remotes/ivan/feature/more-conflictive-mails'