When we're calculating merge-ref-head diff, we want the conflicts
to be merged in diff in order to display them differently