diff --git a/src/backend/langflow/components/vectorstores/Vectara.py b/src/backend/langflow/components/vectorstores/Vectara.py
index 53afd2718..bdcf9aef5 100644
--- a/src/backend/langflow/components/vectorstores/Vectara.py
+++ b/src/backend/langflow/components/vectorstores/Vectara.py
@@ -1,24 +1,13 @@
-<<<<<<< HEAD
-from typing import Optional, Union
-
-from langchain.schema import BaseRetriever, Document
-=======
 from typing import Optional, Union, List
 from langflow import CustomComponent
 import tempfile
 import urllib.request
 import urllib
->>>>>>> 68d6fae606967a7e7ac46ac239dd803d8fde891e
 from langchain.vectorstores import Vectara
+from langchain.schema import Document
 from langchain.vectorstores.base import VectorStore
-<<<<<<< HEAD
-
-from langflow import CustomComponent
-=======
 from langchain.schema import BaseRetriever
-from langchain.schema.vectorstore import VectorStore
 from langchain.embeddings import FakeEmbeddings
->>>>>>> 68d6fae606967a7e7ac46ac239dd803d8fde891e
 
 
 class VectaraComponent(CustomComponent):