diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d61cf30..f86320b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,6 +46,13 @@ jobs:
       - name: Show Ruff version (debug)
         run: ruff --version
 
+      - name: Check for merge conflict markers
+        run: |
+          if git grep -rn -E '^(<{7} |>{7} |={7}$)' -- '.'; then
+            echo "ERROR: Merge conflict markers found in tracked files."
+            exit 1
+          fi
+
       - name: Run Ruff Lint (check)
         # ruff check can --fix locally, but CI should only check (no modifications)
         run: ruff check app/ tests/
diff --git a/frontend/templates/settings.html b/frontend/templates/settings.html
index 80990ad1..5286df7d 100644
--- a/frontend/templates/settings.html
+++ b/frontend/templates/settings.html
@@ -139,7 +139,6 @@
                   Enable {{ setting.key.replace('_', ' ').title() }}
                 </label>
               </div>
-<<<<<<< copilot/add-self-hosted-ocr-support
               {% elif setting.metadata.type == 'multiselect' and setting.metadata.options %}
               <!-- Multi-select checkboxes: stored as comma-separated string -->
               <div class="flex flex-wrap gap-2 mt-1">
@@ -161,7 +160,6 @@
                 {% endfor %}
               </div>
               <p class="mt-1 text-xs text-gray-400">Effective value: <code x-text="formData['{{ setting.key }}'] || '(none)'"></code></p>
-=======
               {% elif setting.metadata.type == 'model_picker' %}
               <!-- Model Picker: free-text input with datalist of common models -->
               <div class="relative">
@@ -185,7 +183,6 @@
                   Pick from the list or type any model name supported by your provider.
                 </p>
               </div>
->>>>>>> main
               {% elif setting.metadata.options %}
               <!-- Dropdown Select for fields with a fixed list of values -->
               <select