Oil edges higher as trade war weighed against threats to supply