diff --git a/Stats/pom.xml b/Stats/pom.xml
index 137a026..63d3864 100644
--- a/Stats/pom.xml
+++ b/Stats/pom.xml
@@ -25,7 +25,6 @@
       </plugin>
       <plugin>
         <artifactId>exec-maven-plugin</artifactId>
-<<<<<<< HEAD
         <version>1.6.0</version>
         <groupId>org.codehaus.mojo</groupId>
         <executions>
@@ -44,27 +43,6 @@
           </arguments>
         </configuration>
       </plugin>
-=======
-          <version>1.6.0</version>
-          <groupId>org.codehaus.mojo</groupId>
-          <executions>
-            <execution>
-              <id>Version Calculation</id>
-              <phase>deploy</phase>
-              <goals>
-                <goal>exec</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <executable>${project.parent.basedir}/deploy_feature.sh</executable>
-            <arguments>
-              <argument>${project.build.directory}/${project.build.finalName}.jar</argument>
-              <argument>${project.artifactId}</argument>
-            </arguments>
-          </configuration>
-        </plugin>
->>>>>>> 6d6cb733a9fd777be26f470880c2af6ca0c7f8c2
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <configuration>