Fix Trac #7560.
Code in conflictInstErr did not handle the case where some branches of a branched family instance had an error and some didn't. It was all or nothing. Now, if there are no conflicts for a given branch, conflictInstErr just ignores the branch instead of panicking.
Showing with 2 additions and 2 deletions