more work on oauth
conflict resolution