updated oauth_token to use access_token instead
no change here
fixed merge conflict