Try 2 for email from user.
Merge remote-tracking branch 'origin/master'