diff --git a/1.txt b/1.txt
index bfa807e..d1d06ad 100644
--- a/1.txt
+++ b/1.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-11
-11
-=======
-1111
->>>>>>> parent of 48fb98a (1)
-111
+1111
\ No newline at end of file