diff --git a/fastapi_app.py b/fastapi_app.py
index e003c88..27b5a03 100644
--- a/fastapi_app.py
+++ b/fastapi_app.py
@@ -80,11 +80,16 @@ from utils.log_util.logger import init_with_fastapi
 # Initialize logger
 logger = logging.getLogger('app')
 
+<<<<<<< HEAD
 # Import route modules
 
 from routes import chat, files, projects, system, skill_manager, database, memory
 from routes.mcp_resources import router as mcp_resources_router
 
+=======
+from routes import chat, files, projects, system, skill_manager, database, memory
+from routes.mcp_resources import router as mcp_resources_router
+>>>>>>> feature/mcp-ui
 from routes.webdav import wsgidav_app
 
 
@@ -213,15 +218,9 @@ app.include_router(skill_manager.router)
 app.include_router(database.router)
 app.include_router(memory.router)
 
-# 注册语音对话路由
-app.include_router(voice.router)
-
 # 注册文件管理API路由
 app.include_router(file_manager_router)
 
-# 注册知识库API路由
-app.include_router(knowledge_base.router, prefix="/api/v1/knowledge-base", tags=["knowledge-base"])
-
 # MCP App resources endpoint
 app.include_router(mcp_resources_router)