difference between conflict settlement and conflict resolution