Oil rises on hopes of easing U.S.-China trade tension