fixed merge conflict
added user login