diff --git a/aider/coders/editblock_prompts.py b/aider/coders/editblock_prompts.py
index 29533c0dd..b4392d318 100644
--- a/aider/coders/editblock_prompts.py
+++ b/aider/coders/editblock_prompts.py
@@ -67,7 +67,6 @@ mathweb/flask/app.py
     return str(math.factorial(n))
 >>>>>>> REPLACE
 {fence[1]}
-<<<<<<< HEAD
 """,
         ),
         dict(