You can't create a new user with an email that's in use
merge
Merge branch 'master' of github.com:markthor/RentIt