Merging Oauth changes