fix error in merge of email-notifications