diff --git a/README.md b/README.md
index 7ee2980..faddb90 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
 # zhangyuhao\_git
 
+<<<<<<< HEAD
+\#branch修改
+=======
 \#main修改
+>>>>>>> main