added email sending
merge conflict