DefaultUnifiedDiffDisplayer doesn't necessarily find the conflict to be displayed

XCOMMONS-1706 introduces the ability to get conflict information from the unified diff display, however the detection if a change is involved in a conflict has not been properly done. It doesn't cover the case when the delta given is the previous one.