diff --git a/111.txt b/111.txt
new file mode 100644
index 0000000..341a1ba
--- /dev/null
+++ b/111.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+nihao!!
+=======
+123456
+>>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486
diff --git a/cmc.txt b/cmc.txt
index 341a1ba..e69de29 100644
--- a/cmc.txt
+++ b/cmc.txt
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-nihao!!
-=======
-123456
->>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486