Fix a merge case with files added in both heads but different