修复不能格式化冲突文件的错误。

Merged 雷淼 requested to merge m-fix into master

Merge request reports