Is an Iran deal ‘over’ and war back on? A timeline of the conflict and talks

Global markets and oil prices have been shaken after the United States and Iran exchanged new strikes, and President Donald Trump indicated negotiations between the countries might be 'over.'