oauth update
merge conflicts