modified email template
resoving merge conflict