Oil prices edge up, but set for weekly loss on inventory build, US-China trade row