Fix error in mrege conflict resolution.