Fix file diff merging code