Oil edges higher with US-China trade tensions, demand in focus