diff --git a/intellij-plugin/src/main/resources/META-INF/plugin.xml b/intellij-plugin/src/main/resources/META-INF/plugin.xml
index 62e076a75173744626c3bb5257f867120f70fae0..2bd9d95fe182ba09469001868f5b622898287577 100644
--- a/intellij-plugin/src/main/resources/META-INF/plugin.xml
+++ b/intellij-plugin/src/main/resources/META-INF/plugin.xml
@@ -1,10 +1,16 @@
 <idea-plugin>
     <id>Scala-Macro-Tools Plugin</id>
     <name>Scala-Macro-Tools</name>
+<<<<<<< HEAD
     <version>0.1.1</version>
     <vendor>Scala Macro Tools</vendor>
     <idea-version since-build="201.0"/>
 
+=======
+    <version>0.1.0</version>
+    <vendor>Scala Macro Tools</vendor>
+    <idea-version since-build="201.0"/>
+>>>>>>> master
     <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.modules.lang</depends>
     <depends>com.intellij.modules.java</depends>
@@ -19,9 +25,12 @@
         <a href="https://github.com/jxnu-liguobin/scala-macro-tools/issues">Issues</a>
         <br/>
         <br/>
+<<<<<<< HEAD
         <b>A plugin that implements Lombok-like functionality with Scala macros</b>
         <br/>
         <br/>
+=======
+>>>>>>> master
         <b>Features</b>
         <ul>
           <li>@toString</li>