diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index bdd4197d167..2ea1a167763 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -177,32 +177,6 @@ services:
     image: nginx:latest
     container_name: summit-nginx
     restart: unless-stopped
-<<<<<<< HEAD
-=======
-    environment:
-      PORT: 4100
-      PROMETHEUS_PORT: 9464
-      # OpenTelemetry Configuration
-      OTEL_SERVICE_NAME: summit-gateway
-      OTEL_SERVICE_VERSION: 1.0.0
-      JAEGER_ENDPOINT: http://jaeger:14268/api/traces
-      OTEL_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4318
-      FEATURE_LAC_ENFORCE: "true"
-      COPILOT_NLQ: "true"
-      UI_TRIPANE: "true"
-      POLICY_COMPILER_URL: "http://policy-compiler:8080"
-      OPA_DECISION_URL: "http://opa:8181/v1/data/policy/authz/abac/decision"
-      TYPESENSE_HOST: "typesense"
-      TYPESENSE_PORT: "8108"
-      TYPESENSE_API_KEY: "xyz"
-    depends_on:
-      server:
-        condition: service_healthy
-      policy-compiler:
-        condition: service_healthy
-      typesense:
-        condition: service_healthy
->>>>>>> pr-21989
     ports:
       - '4100:4100'
       - '9464:9464'
@@ -230,18 +204,6 @@ services:
       retries: 10
     networks:
       - summit
-<<<<<<< HEAD
-=======
-    labels:
-      - 'prometheus.job=summit_gateway'
-      - 'prometheus.port=4100'
-
-  prov-ledger:
-    build: ./services/prov-ledger
-    ports: [ "4010:4010" ]
-    networks:
-      - summit
->>>>>>> pr-21871
 
   policy-compiler:
     build:
@@ -261,14 +223,11 @@ services:
       context: .
       dockerfile: services/ai-nlq/Dockerfile
     ports: [ "8103:8080" ]
-<<<<<<< HEAD
     healthcheck:
       test: [ 'CMD', 'curl', '-f', 'http://localhost:8080/health' ]
       interval: 15s
       timeout: 5s
       retries: 10
-=======
->>>>>>> pr-21871
     networks:
       - summit
 
@@ -277,14 +236,11 @@ services:
       context: .
       dockerfile: services/er-service/Dockerfile
     ports: [ "8104:8080" ]
-<<<<<<< HEAD
     healthcheck:
       test: [ 'CMD', 'curl', '-f', 'http://localhost:8080/health' ]
       interval: 15s
       timeout: 5s
       retries: 10
-=======
->>>>>>> pr-21871
     networks:
       - summit
 
@@ -293,14 +249,11 @@ services:
       context: .
       dockerfile: services/ingest/Dockerfile
     ports: [ "8105:8080" ]
-<<<<<<< HEAD
     healthcheck:
       test: [ 'CMD', 'curl', '-f', 'http://localhost:8080/health' ]
       interval: 15s
       timeout: 5s
       retries: 10
-=======
->>>>>>> pr-21871
     networks:
       - summit
 
@@ -309,14 +262,11 @@ services:
       context: .
       dockerfile: services/zk-tx/Dockerfile
     ports: [ "8106:8080" ]
-<<<<<<< HEAD
     healthcheck:
       test: [ 'CMD', 'curl', '-f', 'http://localhost:8080/health' ]
       interval: 15s
       timeout: 5s
       retries: 10
-=======
->>>>>>> pr-21871
     networks:
       - summit