Merge-revert resolution.