Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'