diff --git a/docs/concepts/models.md b/docs/concepts/models.md
index ed8cf9609..58a86aaed 100644
--- a/docs/concepts/models.md
+++ b/docs/concepts/models.md
@@ -97,7 +97,6 @@ Scan results are ranked by:
 3) Context size
 4) Parameter count
 
-<<<<<<< HEAD
 Input
 - OpenRouter `/models` list (filter `:free`)
 - Requires OpenRouter API key from auth profiles or `OPENROUTER_API_KEY` (see [/environment](/environment))