End State
conflict resolved?