After conflict resolved