Iran conflict resolution