The Israel-Iran conflict has caused oil prices to rise, though less than expected