diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
index 31ed19b..337fc84 100644
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -34,9 +34,7 @@ jobs:
 
       - name: Build public MkDocs site
         run: |
-<<<<<<< codex/refactor-docs-pipeline-for-local-generation
-          python3 -m mkdocs build --strict -f mkdocs-public.yml -d site-public
-=======
+
           python3 -m mkdocs build -f mkdocs-public.yml --strict
 
       - name: Verify published content excludes internal/generated docs
@@ -50,7 +48,6 @@ jobs:
           test ! -e site-public/generated/compose-inventory/index.html
           test ! -e site-public/generated/prometheus-rules/index.html
           test ! -e site-public/docker/index.html
->>>>>>> main
 
       - name: Configure GitHub Pages
         uses: actions/configure-pages@v5