diff --git a/cmc.txt b/cmc.txt
new file mode 100644
index 0000000..341a1ba
--- /dev/null
+++ b/cmc.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+nihao!!
+=======
+123456
+>>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486
diff --git a/新建文本文档.txt b/新建文本文档.txt
deleted file mode 100644
index 490e574..0000000
--- a/新建文本文档.txt
+++ /dev/null
@@ -1 +0,0 @@
-nihao!!
\ No newline at end of file