added login
added login
fixed merge issues