merge conflict
get rid of code in login.js
tolowercase
tolowercase merge