diff --git a/my-project/README.md b/my-project/README.md
index 703061876efe61dc4efc624481575e1551b1e0c5..4c46796f63b8e21d1a518fafa6d9569dd7788c9c 100644
--- a/my-project/README.md
+++ b/my-project/README.md
@@ -2,4 +2,5 @@
 This is a sample project for Git learning.
 
 
-# 另一个开发人员也修改了此文件，并且提交到了远程的主宇宙
\ No newline at end of file
+# 另一个开发人员也修改了此文件，并且提交到了远程的主宇宙，修复了冲突
+#开发人员编辑了文件，于此同时其他开发人员也修改了该文件在主宇宙的版本
diff --git a/wbg-feature/demo.py b/wbg-feature/demo.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/zz-feature/demo.py b/zz-feature/demo.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe848eda1aee33601e9fadbc8df3cb523b46de38
--- /dev/null
+++ b/zz-feature/demo.py
@@ -0,0 +1 @@
+# zz上传的新功能demo
\ No newline at end of file