handle login
fixing merge issues