diff --git a/README_CN.md b/README_CN.md
index d9eba2282d4e1418f1efeeb4893e18c047de6ede..f50408582ffbfddf413c4843d63ef67ac1c6bbef 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -11,18 +11,11 @@ Apache Dubbo Go 璇█瀹炵幇
 Apache License, Version 2.0
 
 ## 浠ｇ爜璁捐 ##
-<<<<<<< HEAD
-鍩轰簬dubbo鐨勫垎灞備唬鐮佽璁�( protocol layer , registry layer , cluster layer , config 绛夌瓑)锛屼綘鍙互閫氳繃璋冪敤鈥� extension.SetXXX 鈥濇嫇灞曡繖浜涘垎灞傛浛鎹� dubbo 鐨勯粯璁ゆ嫇灞曟潵瀹炵幇浣犵殑闇€姹傘€傛杩庤础鐚綘瑙夊緱濂界殑鎷撳睍銆�
-=======
->>>>>>> upstream/develop
 
 鍩轰簬dubbo鐨別xtension妯″潡鍜屽垎灞傜殑浠ｇ爜璁捐(鍖呮嫭 protocol layer, registry layer, cluster layer, config 绛夌瓑)銆傛垜浠殑鐩爣鏄細浣犲彲浠ュ杩欎簺鍒嗗眰鎺ュ彛杩涜鏂扮殑瀹炵幇锛屽苟閫氳繃璋冪敤 extension 妯″潡鐨勨€� extension.SetXXX 鈥濇柟娉曟潵瑕嗙洊 dubbo-go [鍚� go-for-apache-dubbo ]鐨勯粯璁ゅ疄鐜帮紝浠ュ畬鎴愯嚜宸辩殑鐗规畩闇€姹傝€屾棤闇€淇敼婧愪唬鐮併€傚悓鏃讹紝娆㈣繋浣犱负绀惧尯璐＄尞鏈夌敤鐨勬嫇灞曞疄鐜般€�
 
-<<<<<<< HEAD
-=======
 ![妗嗘灦璁捐](https://raw.githubusercontent.com/wiki/dubbo/dubbo-go/dubbo-go%E4%BB%A3%E7%A0%81%E5%88%86%E5%B1%82%E8%AE%BE%E8%AE%A1.png)
 
->>>>>>> upstream/develop
 鍏充簬璇︾粏璁捐璇烽槄璇� [code layered design](https://github.com/dubbo/go-for-apache-dubbo/wiki/dubbo-go-V2.6-design)
 
 ## 鍔熻兘鍒楄〃 ##