conflict resolutions.