A conflict involving Iran did not lead to a significant oil shock as expected. The situation appears to be ongoing, with reports of a ceasefire and ongoing talks between the US and Iran, although the tone of these discussions has been rocky at times. The impact of the conflict on the economy and gas prices is still being assessed.