Oil rises but US-China trade war weighs on demand outlook