Add Rest Framework and OAuth2 settings
Fix conflicts