Fixed code conflicts and email notification implementation for new user signup. (1451)
Added nodemailer package dependency to package.json.