resolution_of_conflict