Oil edges higher with stockpiles and trade war twists in focus