diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 4610a1b77..d0e58b45f 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -131,10 +131,11 @@ function Files({ data,history,owner,projectsId , parentsSha }){
                                     <span>{item.leftIdx && item.leftIdx !=="0" ? item.leftIdx :"" }</span>
                                     <span>{item.rightIdx && item.rightIdx !=="0" ? item.rightIdx :"" }</span>
                                   </span>
-                                  <p style={{display:"flex"}}>
+                                  <div style={{display:"flex"}}>
                                     <span className="linetype">{item.type===2 ? "+" : item.type===3 ? "-" :""}</span>
-                                    { (item.type===3 || item.type===2) ? subStrContent(item.content) : item.content}
-                                  </p>
+                                    <div dangerouslySetInnerHTML={{__html:(item.type===3 || item.type===2) ? subStrContent(item.content) : item.content}}></div>
+                                    {/* <div><span style={{whiteSpace:"pre-wrap"}}>{(item.type===3 || item.type===2) ? subStrContent(item.content) : item.content}</span></div> */}
+                                  </div>
                                 </div>
                               )
                             })
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index a338c2909..d467300a2 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -182,10 +182,11 @@ form .ant-cascader-picker, form .ant-select {
   color: #333;
   flex-wrap: wrap;
 }
-.linesContent > p{
+.linesContent > div{
   flex:1;
   word-break: break-all;
-  /* white-space: pre; */
+  white-space: pre-wrap;
+  font-family: auto;
 }
 .linesContent .lines{
   display: flex;