master conflict resolutions