reverting conflict resolutions