diff --git a/pom.xml b/pom.xml
index daf49d0e2..3d539f0cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
@@ -69,68 +68,5 @@
 		</dependency>
 
     </dependencies>
-    
-=======
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>br.com.rjconsultores</groupId>
-    <artifactId>Flyway</artifactId>
     
-	<version>1.0.14</version>
-    
-	<distributionManagement>
-        <repository>
-            <id>rj-releases</id>
-            <url>http://52.5.53.15:8081/nexus/content/repositories/releases/</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>ISO-8859-1</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-            <version>4.2.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-     	    <artifactId>javax.servlet-api</artifactId>
-	        <version>4.0.0</version>
-            <scope>provided</scope>
-		</dependency>
-
-		<dependency>
-		    <groupId>com.oracle.database.jdbc</groupId>
-		    <artifactId>ojdbc8</artifactId>
-		    <version>21.7.0.0</version>
-		</dependency>
-
-    </dependencies>
-    
->>>>>>> 0227c90bf3907b4e6e7eb75916aaea43fe814397
 </project>
\ No newline at end of file