Added html & text emails
Conflict residue