Fixed Conflict issue

chatbot/chains.py

@@ -1,5 +1,5 @@
 from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder
-from .prompts import CONTEXTUALIZE_Q_SYS_PROMPT, QA_SYS_PROMPT, ROUTER_SYS_PROMPT
+from .prompts import CONTEXTUALIZE_Q_SYS_PROMPT, ROUTER_SYS_PROMPT
 from langchain_core.output_parsers import StrOutputParser
 from langchain_google_genai import ChatGoogleGenerativeAI
 from langchain_groq import ChatGroq
@@ -22,13 +22,8 @@ groq_llm = ChatGroq(model="llama-3.3-70b-versatile", api_key=os.environ.get("GRO
 contextualize_q_chain = contextualize_q_prompt | groq_llm | StrOutputParser()
 
 gemini_llm = ChatGoogleGenerativeAI(
-<<<<<<< HEAD
     model=os.getenv("MODEL"),
     google_api_key=os.getenv("GOOGLE_API_KEY"),
-=======
-    model="gemini-2.5-flash-preview-05-20",
-    google_api_key=os.environ.get("GOOGLE_API_KEY"),
->>>>>>> 93689ff4f23ab7484a10e8e0885ccb5bbe212925
     temperature=0.5,
 )
 structured_llm = gemini_llm.with_structured_output(OutputFormat)