resolve merge conflicts
change email validation method