I'm guessed John Boliter is the individual that had some parental issues? I don't really know how to fix problems in the general case, as I'd never done a merge before, but when I viewed John Boliter's tree post-merge, there was a triangular emblem vaguely reminiscent of a caution sign in the bottom left of his entry on the tree. When I clicked that, it allowed me to merge parents and siblings so that there weren't any more conflicts.
As to what happens if you've already done that and there are still merge issues, I'm not sure, never having done that myself; but if you haven't done that yet, maybe try looking at the individual's tree view and seeing if they have that problem icon on the bottom left of their entry.
