diff --git a/doc/development/fe_guide/style_guide_js.md b/doc/development/fe_guide/style_guide_js.md
index bb7537ba8effdb5b46407078d059d73f7b5821d6..027731628011f73d0b12479437564efe7a97b9f6 100644
--- a/doc/development/fe_guide/style_guide_js.md
+++ b/doc/development/fe_guide/style_guide_js.md
@@ -368,10 +368,6 @@ Please check this [rules][eslint-plugin-vue-rules] for more documentation.
         // bad
          <component
             bar="bar" />
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
       ```
 
 #### Quotes