diff --git a/fenzhi1.txt b/fenzhi1.txt
new file mode 100644
index 0000000..d86868e
--- /dev/null
+++ b/fenzhi1.txt
@@ -0,0 +1 @@
+this is fenzhi1
\ No newline at end of file
diff --git a/fenzhi2.txt b/fenzhi2.txt
new file mode 100644
index 0000000..a51b1b1
--- /dev/null
+++ b/fenzhi2.txt
@@ -0,0 +1 @@
+this is fenzhu2
\ No newline at end of file
diff --git a/fenzhi3.txt b/fenzhi3.txt
new file mode 100644
index 0000000..bb659ca
--- /dev/null
+++ b/fenzhi3.txt
@@ -0,0 +1 @@
+this is fenzhi3
\ No newline at end of file
diff --git a/laqu1 b/laqu1
new file mode 100644
index 0000000..62c5006
--- /dev/null
+++ b/laqu1
@@ -0,0 +1 @@
+this is laqu 
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 468d065..5c04216 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1 +1,2 @@
-this is a source_test from master
\ No newline at end of file
+<<<<<<< HEAD
+this is a source_test from master