diff --git a/1.txt b/1.txt
index d1d06ad..e98ae8f 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1,5 @@
-1111
\ No newline at end of file
+<<<<<<< HEAD
+1111
+=======
+patch change
+>>>>>>> patch:modify 1. txt