diff --git a/doc/1.txt b/doc/1.txt
index 72ac5b3..a0fe494 100644
--- a/doc/1.txt
+++ b/doc/1.txt
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 111
 222
-=======
-222
-333
->>>>>>> main
+