diff --git a/README.md b/README.md
index fea2aeb..f05288a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,11 @@
 git init
 git checkout -b 华为电脑
 git add .
+<<<<<<< HEAD
 git commit -m "20250213"
+=======
+git commit -m "2025/2/13"
+>>>>>>> 7104eb5a522e6bbea960e5c9ec89cbf95aa92e64
 git remote add origin http://8.134.237.70:7999/lqs/xml_rpc.git
 git push -u origin 华为电脑
 ```