Oil edges up as US, China tamp down trade tension