Added login
Fixed merge conflict