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