diff --git a/deployment/README.md b/deployment/README.md
index c405d7f2..6b6b19ef 100644
--- a/deployment/README.md
+++ b/deployment/README.md
@@ -30,11 +30,7 @@ The CI/CD pipeline has two jobs defined in [main.yml](../.github/workflows/main.
 - **Deploy To AWS**
   - Once the "Build and Scan Image with Integration Tests" job passes, the deployment process is initiated.
   - We log into AWS and ECR using OIDC roles and configure kubeconfig.
-<<<<<<< HEAD
   - Then, we deploy using Helm upgrade, which utilizes the `values.yaml` generated from `values.yaml.prod.template` after substituting the variable values.
-=======
-  - Then, we deploy using Helm upgrade, which utilizes the `values.yaml` generated from `values.yaml.develop.template` after substituting the variable values.
-
 
 ## Solr Schema Update
 
@@ -92,4 +88,3 @@ Once the collection is created, update the CKAN_SOLR_URL secret in CKAN to use t
 CKAN_SOLR_URL: http://solr-url/solr/ckan
 ```
 Where `ckan` is name of newly created collection
->>>>>>> staging