显示 conflict 信息

Merged 雷淼 requested to merge m-conflict into master

忽略自己 WIP 的MR。

Merge request reports