now gives alerts if email is not set
fixing merge conflicts