Fix merging the merge result of a merge where at least one of the sets h...

...ad x/mrefs