diff --git a/fastapi_app.py b/fastapi_app.py
index 80e174e..5e5ca35 100644
--- a/fastapi_app.py
+++ b/fastapi_app.py
@@ -80,16 +80,8 @@ 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