fixed merge issues and login