Oil rises on escalating US-Iran tensions; trade war concerns weigh