diff --git a/core-java-modules/core-java-lang-operators-2/pom.xml b/core-java-modules/core-java-lang-operators-2/pom.xml
index ffb2b1059d..9fb0df3e5e 100644
--- a/core-java-modules/core-java-lang-operators-2/pom.xml
+++ b/core-java-modules/core-java-lang-operators-2/pom.xml
@@ -12,6 +12,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
+<<<<<<< HEAD
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -25,6 +26,21 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
+=======
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+>>>>>>> parent of 7dd02df1ae (Update pom.xml)
 
 	<build>
 		<finalName>core-java-lang-operators-2</finalName>
@@ -36,4 +52,4 @@
 		</resources>
 	</build>
 
-</project>
+</project>
\ No newline at end of file