working on login
solved merge conflict