diff --git a/src/main/environment/common_local.properties.bkp b/src/main/environment/common_local.properties.bkp
deleted file mode 100644
index 4df6ba885..000000000
--- a/src/main/environment/common_local.properties.bkp
+++ /dev/null
@@ -1,116 +0,0 @@
-server.port=8081
-fhir-url=http://localhost:8093/
-
-##--------------------------------------------## Primary db-------------------------------------------------------------------
-spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
-spring.datasource.username=root
-spring.datasource.password=1234
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-##--------------------------------------------## Secondary db-------------------------------------------------------------------
-secondary.datasource.url=jdbc:mysql://localhost:3306/db_identity
-secondary.datasource.username=root
-secondary.datasource.password=1234
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-spring.main.banner-mode=off
-spring.data.jpa.repositories.enabled=true
-#spring.jpa.hibernate.ddl-auto=none
-
-# Naming strategies
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
-spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-
-# The SQL dialect makes Hibernate generate better SQL for the chosen database
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQLDialect
-
-#Below lines are added for security reasons
-
-spring.session.store-type=redis
-spring.redis.host=localhost
-spring.redis.password=
-spring.redis.port=6379
-
-cors.allowed-origins=http://localhost:*
-
-## Below values are needed for extending the expiry time and extend expiry time.
-iemr.extend.expiry.time=true
-iemr.session.expiry.time=7200
-enableIPValidation=false
-
-#logging.pattern.level=DEBUG
-logging.level.root=INFO
-logging.level.org.springframework.web=INFO
-logging.level.org.hibernate=INFO
-logging.level.com.iemr=DEBUG
-logging.level.org.springframework=INFO
-
-spring.datasource.tomcat.initial-size=5
-spring.datasource.tomcat.max-idle=15
-spring.datasource.tomcat.max-active=30
-spring.datasource.tomcat.min-idle=5
-spring.datasource.tomcat.min-evictable-idle-time-millis=15000
-spring.datasource.tomcat.remove-abandoned=true
-spring.datasource.tomcat.logAbandoned=true
-spring.datasource.continue-on-error=true
-spring.datasource.tomcat.remove-abandoned-timeout=600
-door-to-door-page-size=10
-
-#Get-HRP-Status
-get-HRP-Status=ANC/getHRPStatus
-
-#Get Beneficiary ABHA
-getHealthID=healthID/getBenhealthID
-
-# TM API URL
-tm-url=https://amritdemo.piramalswasthya.org/tm-api
-jwt.secret=eefa40497bb9b2a8491b85069aff62e7596521c6816e471c464181b52eac7670ff91394a
-<<<<<<<< HEAD:src/main/environment/common_local.properties.bkp
-========
-source-address=
-sms-username=
-sms-password=
-send-message-url=
-
-crash.logs.base.path=logs/
-stoptb.enforce.vanid = false
-
-# ── Diagnostic Device Integration ────────────────────────────────────────────
-# diagnostic.provider.xray / diagnostic.provider.truenat select the vendor per orderType family
-# (XRAY_CHEST vs MTB/MTB_PLUS/MDR_RIF), each must be one of com.iemr.flw.masterEnum.DiagnosticProviderCode
-diagnostic.provider.xray=${DIAGNOSTIC_PROVIDER_XRAY}
-diagnostic.provider.truenat=${DIAGNOSTIC_PROVIDER_TRUENAT}
-
-# EMR Lite - xray group (same base-url as truenat for now; split so a distinct vendor/tenant can be
-# swapped in for either group later without a code change)
-diagnostic.emrlite.xray.base-url=${DIAGNOSTIC_EMRLITE_XRAY_BASE_URL}
-diagnostic.emrlite.xray.login-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/login/
-diagnostic.emrlite.xray.refresh-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/getAccessToken/
-diagnostic.emrlite.xray.order-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/
-diagnostic.emrlite.xray.result-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/result/
-diagnostic.emrlite.xray.ping-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
-diagnostic.emrlite.xray.username=${DIAGNOSTIC_EMRLITE_XRAY_USERNAME}
-diagnostic.emrlite.xray.password=${DIAGNOSTIC_EMRLITE_XRAY_PASSWORD}
-
-# EMR Lite - truenat group (MTB/MTB_PLUS/MDR_RIF); same value as xray for now
-diagnostic.emrlite.truenat.base-url=${DIAGNOSTIC_EMRLITE_TRUENAT_BASE_URL}
-diagnostic.emrlite.truenat.login-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/login/
-diagnostic.emrlite.truenat.refresh-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/getAccessToken/
-diagnostic.emrlite.truenat.order-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/
-diagnostic.emrlite.truenat.result-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/result/
-diagnostic.emrlite.truenat.ping-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/ping/
-diagnostic.emrlite.truenat.username=${DIAGNOSTIC_EMRLITE_TRUENAT_USERNAME}
-diagnostic.emrlite.truenat.password=${DIAGNOSTIC_EMRLITE_TRUENAT_PASSWORD}
-
-diagnostic.emrlite.token-ttl-seconds=${DIAGNOSTIC_EMRLITE_TOKEN_TTL_SECONDS}
-diagnostic.emrlite.refresh-ttl-seconds=${DIAGNOSTIC_EMRLITE_REFRESH_TTL_SECONDS}
-
-diagnostic.poll.xray.tick-ms=${DIAGNOSTIC_POLL_XRAY_TICK_MS}
-diagnostic.poll.truenat.tick-ms=${DIAGNOSTIC_POLL_TRUENAT_TICK_MS}
-# Daily cutoff (cron expression) after which all outstanding PENDING/IN_PROGRESS orders are marked EXPIRED
-diagnostic.poll.expiry-cron=${DIAGNOSTIC_POLL_EXPIRY_CRON}
-
-diagnostic.documents.storage-root=${DIAGNOSTIC_DOCUMENTS_STORAGE_ROOT}
-
-
->>>>>>>> origin/release-3.8.3:src/main/environment/common_local.properties