diff --git a/.gitignore b/.gitignore
index 00ba4b4..1bcc19d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,8 +176,6 @@ cython_debug/
 # Telegram session files
 *.session
 *.session-journal
-<<<<<<< HEAD
-=======
 anon.session
 anon.session-journal
 anon_new.session