Update app.py

app.py

@@ -6,18 +6,11 @@ import gradio as gr
 import pickle
 from query_data import get_chain
 from threading import Lock
-<<<<<<< HEAD
 from langchain.vectorstores.faiss import FAISS
 from langchain.embeddings import OpenAIEmbeddings
 
 embeddings = OpenAIEmbeddings()
 vectorstore = FAISS.load_local('saved_model/vector.db',embeddings)
-=======
-
-with open("model.pkl", "rb") as f:
-    vectorstore = pickle.load(f)
-
->>>>>>> 0012f981c5af911db5ecea0510735d739fb6a6e6
 
 def set_openai_api_key(api_key: str):
     """Set the api key and return chain.