- conflict resolutions