diff --git a/pom.xml b/pom.xml
index 76a2222f..5a25cb2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<<<<<<< HEAD
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apollo</artifactId>
   <version>1.0</version>
@@ -45,38 +44,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</project>
-=======
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apollo</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <groupId>apollo</groupId>
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        <testSourceDirectory>test</testSourceDirectory>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jruby</groupId>
-            <artifactId>jruby-complete</artifactId>
-            <version>1.7.10</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>16.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>4.0.15.Final</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>
->>>>>>> 86a477d2133d3cab6d6d9983e1bb939db088db39
+</project>
\ No newline at end of file