diff --git a/.gitignore b/.gitignore
index 7235962..2385bcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,8 @@
-<<<<<<< HEAD
 .idea
-=======
->>>>>>> 7b4602c ([MOSIP-33316] Merge develop from develop-java21)
 /.metadata/
 .sonarlint/
 */.classpath
 */.gitignore
 */.project
-<<<<<<< HEAD
 */.settings/
-*/target/
-=======
-*/.settings/
->>>>>>> 7b4602c ([MOSIP-33316] Merge develop from develop-java21)
+*/target/
\ No newline at end of file