diff --git a/fastapi_app.py b/fastapi_app.py
index b3e8ace..c39c370 100644
--- a/fastapi_app.py
+++ b/fastapi_app.py
@@ -256,6 +256,11 @@ app.include_router(bot_manager.router)
 app.include_router(payment.router)
 app.include_router(memory.router)
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+
+>>>>>>> 319bd8cd59268f2b16dce2dfa14820cb34c4c8b8
 # 注册语音对话路由
 app.include_router(voice.router)
 
@@ -265,6 +270,22 @@ app.include_router(file_manager_router)
 # 注册知识库API路由
 app.include_router(knowledge_base.router, prefix="/api/v1/knowledge-base", tags=["knowledge-base"])
 
+<<<<<<< HEAD
+=======
+
+# 挂载 WsgiDAV（WSGI 应用通过 WSGIMiddleware 集成到 ASGI）
+
+# MCP App resources endpoint
+app.include_router(mcp_resources_router)
+=======
+
+# 挂载 WsgiDAV（WSGI 应用通过 WSGIMiddleware 集成到 ASGI）
+
+>>>>>>> feature/mcp-ui
+# Register the file management API routes
+app.include_router(file_manager_router)
+
+>>>>>>> 319bd8cd59268f2b16dce2dfa14820cb34c4c8b8
 # Mount WsgiDAV (the WSGI app is integrated into ASGI via WSGIMiddleware)
 
 from starlette.middleware.wsgi import WSGIMiddleware