Revert "去掉提交中的冲突注释"

This reverts commit d86a40ac856b40dd3daa2af6677b6ccf54bae0d1.
Revert "Revert "去掉提交中的冲突注释""

This reverts commit 337bd9139d34982a2562cab8ea64461bf4e799f7.