fixed merge issues with Oauth