diff --git a/1.txt b/1.txt
index daca270..bfa807e 100644
--- a/1.txt
+++ b/1.txt
@@ -4,4 +4,4 @@
 =======
 1111
 >>>>>>> parent of 48fb98a (1)
-1
+111