update consumer token rdio
resolve merge conflict