diff --git a/server/main.py b/server/main.py
index e5a520db..5478f52d 100644
--- a/server/main.py
+++ b/server/main.py
@@ -11,11 +11,7 @@
 from data_class import ChatData
 
 # Import fastapi routers
-<<<<<<< HEAD
-from routers import bot, health_checker, github
-=======
 from routers import bot, health_checker, github, rag
->>>>>>> new-branch-name
 
 open_api_key = get_env_variable("OPENAI_API_KEY")
 is_dev = bool(get_env_variable("IS_DEV"))