diff --git a/src/main/java/com/billpaymentservice/bbps/dto/request/MasterCategoryRequest.java b/src/main/java/com/billpaymentservice/bbps/dto/request/MasterCategoryRequest.java
index 0218ff4..d1816cc 100644
--- a/src/main/java/com/billpaymentservice/bbps/dto/request/MasterCategoryRequest.java
+++ b/src/main/java/com/billpaymentservice/bbps/dto/request/MasterCategoryRequest.java
@@ -18,10 +18,10 @@ public class MasterCategoryRequest extends BaseClass {
 	@NotNull
 	private String category;
 
-	private Integer pageStart = 0;
+	private Integer pageNo = 0;
 
 	@NotNull(message = "pageEnd is required")
 	@Min(value = 1, message = "pageEnd must be greater than 0")
-	private Integer pageEnd;
+	private Integer pageSize;
 
 }
diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java
index a851b0a..33af478 100644
--- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java
+++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java
@@ -285,7 +285,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 			helper.validateMerchant(masterRequest.getMid());
 			String fullUrl = String.format("%s%s?billerName=%s&category=%s&page=%d&pagesize=%d", masterRegisterUrl,
 					BBPSConstant.BILLER_URL, masterRequest.getBillerName(), masterRequest.getCategory(),
-					masterRequest.getPageStart(), masterRequest.getPageEnd());
+					masterRequest.getPageNo(), masterRequest.getPageSize());
 
 			OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
 
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
new file mode 100644
index 0000000..3c39389
--- /dev/null
+++ b/src/main/resources/application-local.properties
@@ -0,0 +1,50 @@
+spring.application.name=bbps
+
+
+# Server port
+server.port=9090
+
+# JPA & Hibernate
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.default_schema=public
+
+#swagger.server.url=https://procurelinc.in/BBPS
+#swagger.server.description=Production Server
+
+swagger.server.url=http://192.168.1.24:9090
+
+swagger.server.description=Local Development Server
+
+
+# DataSource
+spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
+spring.datasource.username=postgres
+spring.datasource.password=UAT@DB_2025
+
+#spring.datasource.password=himanshu@123
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+
+
+# HikariCP settings
+spring.datasource.hikari.connection-timeout=10000
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=50
+spring.datasource.hikari.idle-timeout=2000000
+spring.datasource.hikari.max-lifetime=110000
+spring.datasource.hikari.auto-commit=true
+
+# Logging levels
+logging.level.io.github.resilience4j.retry=DEBUG
+
+
+# BBPS URLs
+master.data.url = https://bbps-staging.digiledge.in/agent/cou-master/masters
+agent.data.url=https://bbps-staging.digiledge.in/agent/bill-payment-new
+payment.data.url=https://bbps-staging.digiledge.in/couapp
+
+
+# Resilience4j Retry
+resilience4j.retry.instances.callbackService.max-attempts=1
+resilience4j.retry.instances.callbackService.wait-duration=2s
diff --git a/src/main/resources/application-uat.properties b/src/main/resources/application-uat.properties
new file mode 100644
index 0000000..41bb455
--- /dev/null
+++ b/src/main/resources/application-uat.properties
@@ -0,0 +1,47 @@
+spring.application.name=bbps
+
+
+# Server port
+server.port=9090
+
+# JPA & Hibernate
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.default_schema=public
+
+swagger.server.url=https://11.godemo.in/BBPS
+swagger.server.description=Production Server
+
+#swagger.server.url=http://localhost:9090
+#swagger.server.description=Local Development Server
+
+
+# DataSource
+spring.datasource.url=jdbc:postgresql://localhost:5432/bbps
+spring.datasource.username=postgres
+spring.datasource.password=LincPay098)(*
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+
+
+# HikariCP settings
+spring.datasource.hikari.connection-timeout=10000
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=50
+spring.datasource.hikari.idle-timeout=2000000
+spring.datasource.hikari.max-lifetime=110000
+spring.datasource.hikari.auto-commit=true
+
+# Logging levels
+logging.level.io.github.resilience4j.retry=DEBUG
+
+
+# BBPS URLs
+master.data.url = https://bbps-staging.digiledge.in/agent/cou-master/masters
+agent.data.url=https://bbps-staging.digiledge.in/agent/bill-payment-new
+payment.data.url=https://bbps-staging.digiledge.in/couapp
+
+
+# Resilience4j Retry
+resilience4j.retry.instances.callbackService.max-attempts=1
+resilience4j.retry.instances.callbackService.wait-duration=2s
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4f044d5..be00e5a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -16,15 +16,15 @@ swagger.server.url=http://192.168.1.24:9090
 
 swagger.server.description=Local Development Server
 
+spring.profiles.active=local
+
 
 # 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.password=himanshu@123
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 
@@ -40,7 +40,6 @@ spring.datasource.hikari.auto-commit=true
 # Logging levels
 logging.level.io.github.resilience4j.retry=DEBUG
 
-
 # BBPS URLs
 master.data.url = https://bbps-staging.digiledge.in/agent/cou-master/masters
 agent.data.url=https://bbps-staging.digiledge.in/agent/bill-payment-new