diff --git a/.gitignore b/.gitignore
index 87e58325c..8ba6a45fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,4 +59,3 @@ cmd/telegram/
 !web/backend/dist/
 web/backend/dist/*
 !web/backend/dist/.gitkeep
->>>>>>> origin/main