Resolves oauth merge conflict