diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4f044d5..a03b211 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,11 +20,8 @@ swagger.server.description=Local Development Server
 # DataSource
 spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
 spring.datasource.username=postgres
-<<<<<<< HEAD
-spring.datasource.password=UAT@DB_2025
-=======
+
 spring.datasource.password=himanshu@123
->>>>>>> 43baedfecdf5e3718ba3e8b932536b3798957d22
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource