Oil rises amid expectations of resolving trade disputes between China and America