diff --git a/README.md b/README.md
index fd08a023..6fe39339 100644
--- a/README.md
+++ b/README.md
@@ -105,18 +105,10 @@ npm run dev
## 反馈
-<<<<<<< HEAD
-| Github Issue | Fes.js 开源运营小助手 |
-| --- | --- |
-| [@fesjs/fes.js/issues](../../issues) |
|
-
-=======
-| Github Issue | Fes.js 开源运营小助手 |
+| Github Issue | Fes.js 开源运营小助手 |
| ------------------------------------ | ------------------------------------------------------------------------------------------------ |
| [@fesjs/fes.js/issues](../../issues) |
|
-> > > > > > > next
-
## 参与共建
我们非常欢迎社区同学能提交 PR: