Fix the conflict diff output