conflict resolutions (1)