diff --git a/fastapi_app.py b/fastapi_app.py
index 3d88d15..d1b73a8 100644
--- a/fastapi_app.py
+++ b/fastapi_app.py
@@ -81,12 +81,10 @@ from utils.log_util.logger import init_with_fastapi
 logger = logging.getLogger('app')
 
 # Import route modules
-<<<<<<< Updated upstream
-from routes import chat, files, projects, system, skill_manager, database, memory
-=======
+
 from routes import chat, files, projects, system, skill_manager, database, memory, bot_manager, knowledge_base, payment, voice
 from routes.mcp_resources import router as mcp_resources_router
->>>>>>> Stashed changes
+
 from routes.webdav import wsgidav_app
 
 
@@ -215,8 +213,6 @@ app.include_router(skill_manager.router)
 app.include_router(database.router)
 app.include_router(memory.router)
 
-<<<<<<< Updated upstream
-=======
 # 注册语音对话路由
 app.include_router(voice.router)
 
@@ -231,7 +227,6 @@ app.include_router(mcp_resources_router)
 
 # 挂载 WsgiDAV（WSGI 应用通过 WSGIMiddleware 集成到 ASGI）
 
->>>>>>> Stashed changes
 # Register the file management API routes
 app.include_router(file_manager_router)