login works, root redirects to login
resolve merge conflict