fixes #56
Merge pull request #61 from dotCMS/issue-56-cant-view-remaining-conflicts-if-you-partial-fix

fixes #56