Oil prices edge up; US-China trade tensions cap gains