diff --git a/pom.xml b/pom.xml
index 271f72143..fd2ab9d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
 <<<<<<< HEAD
     <!-- B-Developer made same changes on feature2/2025.03.30 -->
 =======
-    <!-- A-Developer made same changes on feature2/2025.03.30 mvn-->
-        <!-- A-Developer made same changes on feature2/2025.03.30 mvn-->
+    <!-- A-Developer made same changes on feature2/2025.03.30 -->
+        <!-- A-Developer made same changes on feature2/2025.04.06-->
 
 >>>>>>> f825992acb26c01f1af53305343a9ee693b4da2b
   <parent>