changed oauth
conflict management
conflict fix