Remove merge statements

app.py

@@ -7,13 +7,11 @@ from llama_index import (
     download_loader,
 )
 import chromadb
-<<<<<<< HEAD
 import typing_extensions
 
 
 =======
 from llama_index import Document
->>>>>>> ingest_data
 from llama_index.llms import MistralAI
 from llama_index.embeddings import MistralAIEmbedding
 from llama_index.vector_stores import ChromaVectorStore
@@ -28,7 +26,7 @@ placeholder = (
 placeholder_url = "Extract text from this url"
 llm_model = "mistral-small"
 
-env_api_key = 'Yb2kAF0DR4Mva5AEmoYFV3kYRAKdXB7i'#os.environ.get("MISTRAL_API_KEY")
+env_api_key = os.environ.get("MISTRAL_API_KEY")
 query_engine = None
 
 # Define LLMs