Ready to test Mark e-mail
Mark e-mail ready
Resolved conflicts