Oil rises on U.S.-China trade deal hopes