diff --git a/idea-plug-in/index.html b/idea-plug-in/index.html
index 6b01b53..3ff46a8 100644
--- a/idea-plug-in/index.html
+++ b/idea-plug-in/index.html
@@ -147,8 +147,6 @@ dependencies {
           <p align="center">
               <img src="../pics/show-log.png" class="img-rounded"/>
           </p>
-
->>>>>>> IDEA plug-in doc.
       </div>
 
       <!-- Table of contents -->