- conflict resolved