diff --git a/ls-feature/demo.py b/ls-feature/demo.py
new file mode 100644
index 0000000000000000000000000000000000000000..87d5124e7269860ab55bd4a858c4cb6dffdca59d
--- /dev/null
+++ b/ls-feature/demo.py
@@ -0,0 +1 @@
+# ls上传新的功能
\ No newline at end of file
diff --git a/my-project/README.md b/my-project/README.md
index 703061876efe61dc4efc624481575e1551b1e0c5..772a16e5f2f53da74ee44b532a8193384ed3b238 100644
--- a/my-project/README.md
+++ b/my-project/README.md
@@ -1,5 +1,11 @@
 # My Project
 This is a sample project for Git learning.
+<<<<<<< HEAD
 
 
-# 另一个开发人员也修改了此文件，并且提交到了远程的主宇宙
\ No newline at end of file
+# 另一个开发人员也修改了此文件，并且提交到了远程的主宇宙,哈哈哈哈
+=======
+<!-- 开发人员也修改了该文件在主宇宙的版本 -->
+>>>>>>> b9cb502 (修改了readme)
+
+<!-- 第三人在上两个人又修改了文件 -->
\ 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