So much oauth.
resolving conflicts