diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile
index 4f529477..574e8e92 100644
--- a/services/caddy/Caddyfile
+++ b/services/caddy/Caddyfile
@@ -10,15 +10,10 @@
     # CORS is handled at the edge by Traefik's headers middleware.
     # Do not set or strip Access-Control-* headers here to avoid conflicts.
 
-<<<<<<< HEAD
-    # Replication bootstrap snapshots contain sensitive failover credentials.
-    @replication_bootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
-    respond @replication_bootstrap 404
-=======
     # Do not expose local replication bootstrap material from the public web root.
-    @replicationBootstrap path /storage/replication-bootstrap.json
+    # Bootstrap snapshots contain sensitive failover credentials.
+    @replicationBootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
     respond @replicationBootstrap 404
->>>>>>> refs/remotes/origin/master
 
     # PHP handling via FastCGI to php-fpm pool
     php_fastcgi php1:9000 php2:9000 php3:9000 php4:9000 php5:9000
diff --git a/services/caddy/Caddyfile-staging b/services/caddy/Caddyfile-staging
index 81da3375..645b24f0 100644
--- a/services/caddy/Caddyfile-staging
+++ b/services/caddy/Caddyfile-staging
@@ -10,15 +10,10 @@
     # CORS is handled at the edge by Traefik's headers middleware.
     # Do not set or strip Access-Control-* headers here to avoid conflicts.
 
-<<<<<<< HEAD
-    # Replication bootstrap snapshots contain sensitive failover credentials.
-    @replication_bootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
-    respond @replication_bootstrap 404
-=======
     # Do not expose local replication bootstrap material from the public web root.
-    @replicationBootstrap path /storage/replication-bootstrap.json
+    # Bootstrap snapshots contain sensitive failover credentials.
+    @replicationBootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
     respond @replicationBootstrap 404
->>>>>>> refs/remotes/origin/master
 
     # PHP handling via FastCGI to php-fpm pool
     php_fastcgi php-staging:9000