oauth
resolved conflicts
oauth token received
fixed routes conflict