wip: user login
resolve conflicts