diff --git a/.gitignore b/.gitignore
index 2211df6..6193be7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+<<<<<<< HEAD
 *.txt
+=======
+*.txt
+>>>>>>> fenzhi2
diff --git a/1.txt b/1.txt
new file mode 100644
index 0000000..9d07aa0
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+111
\ No newline at end of file
diff --git a/hello.txt b/hello.txt
index d4cdcb2..f654329 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,2 +1,2 @@
 hello
-3
\ No newline at end of file
+2