Resolved merge conflict in BaseClass.java

src/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.jpa.properties.hibernate.default_schema=public
 # DataSource
 spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
 spring.datasource.username=postgres
-spring.datasource.password=thakur@123
+spring.datasource.password=himanshu@123
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource