Oil prices edge up but US-China trade war drags