diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 61a9a9a4b..c7a96468c 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -280,7 +280,7 @@ class MessageCount extends Component {
             <p>
               {
                 conflict_files.map((i,k)=>{
-                  return k>0 ? "，"+i : i
+                  return <p>{i}</p>
                 })
               }
             </p>