diff --git a/.gitignore b/.gitignore
index e798fb31..8b5f9521 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,9 +60,6 @@ cmd/telegram/
 web/backend/dist/*
 !web/backend/dist/.gitkeep
 
-<<<<<<< HEAD
 .claude/
-=======
 
 docker/data
->>>>>>> upstream-main