diff --git a/README.md b/README.md
index bd2504bfcfa9322a635739fff2e36db8c7b4815e..c7dcaa73467fee381033b4b19b2334a79aa9fa53 100644
--- a/README.md
+++ b/README.md
@@ -35,11 +35,15 @@ jiang xiao
 
 Shiyao Gu
 
+<<<<<<< HEAD
+ShanQiancheng
+=======
 =======
 tian
 
 tianBW
 >>>>>>> upstream/master
+>>>>>>> upstream/master
 
 #### Gitee Feature