diff --git a/pom.xml b/pom.xml
index 8033c985b..3cec28114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,11 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
     <!-- push my changes on iuse ssh feature/2025.03.30-->
-
+<<<<<<< HEAD
+    <!-- B-Developer made same changes on feature2/2025.03.30 -->
+=======
+    <!-- A-Developer made same changes on feature2/2025.03.30 -->
+>>>>>>> f825992acb26c01f1af53305343a9ee693b4da2b
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>