Oil rises on hopes for US-China trade spat breakthrough