diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml
index a72dbcba50..5334bfba70 100644
--- a/libraries-3/pom.xml
+++ b/libraries-3/pom.xml
@@ -70,25 +70,6 @@
             <artifactId>velocity-engine-core</artifactId>
             <version>${velocity-engine-core.version}</version>
         </dependency>
-<<<<<<< HEAD
-	<dependency>
-            <groupId>com.uber.nullaway</groupId>
-            <artifactId>nullaway</artifactId>
-            <version>0.3.0</version>
-	</dependency>
-	<dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-compiler-javac-errorprone</artifactId>
-            <version>2.8</version>
-	</dependency>
-	<!-- override plexus-compiler-javac-errorprone's dependency on
-             Error Prone with the latest version -->
-	<dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_core</artifactId>
-            <version>2.1.3</version>
-	</dependency>
-=======
           <dependency>
             <groupId>com.uber.nullaway</groupId>
             <artifactId>nullaway</artifactId>
@@ -106,7 +87,6 @@
             <artifactId>error_prone_core</artifactId>
             <version>2.1.3</version>
         </dependency>
->>>>>>> upstream/master
     </dependencies>
 
     <repositories>
@@ -143,20 +123,11 @@
                     </dependency>
                 </dependencies>
             </plugin>
-<<<<<<< HEAD
-			
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<version>3.5</version>
-		<configuration>
-=======
                <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5</version>
                 <configuration>
->>>>>>> upstream/master
                     <compilerId>javac-with-errorprone</compilerId>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                     <source>1.8</source>
@@ -172,11 +143,7 @@
                     <compilerArgs>
                         <!-- NullAway will warn by default, uncomment the next line to make the build fail -->
                         <!-- <arg>-Xep:NullAway:ERROR</arg> -->
-<<<<<<< HEAD
-                        <arg>-XepExcludedPaths:(.*)/test/.*|(.*)/streamex/.*|(.*)/jcabi/.*</arg>
-=======
                         <arg>-XepExcludedPaths:(.*)/test/.*|(.*)/jcabi/.*</arg>
->>>>>>> upstream/master
                         <arg>-XepOpt:NullAway:AnnotatedPackages=com.baeldung.nullaway</arg>
                     </compilerArgs>
                 </configuration>