diff --git a/docs/content/roadmap.md b/docs/content/roadmap.md
index 6ab38e1..1cd594f 100644
--- a/docs/content/roadmap.md
+++ b/docs/content/roadmap.md
@@ -103,10 +103,7 @@
 * [active-call](https://github.com/miuda-ai/active-call)
 * [TEN](https://github.com/TEN-framework/ten-framework)
 * [airi](https://github.com/moeru-ai/airi)
-<<<<<<< HEAD
 * [Vocode Core](https://github.com/vocodedev/vocode-core)
-=======
->>>>>>> efdcbe55501bb0f2210dad75c3f1b791a3e53497
 * [awesome-voice-agents](https://github.com/yzfly/awesome-voice-agents)
 
 ### 商业项目