diff --git a/libs/community/langchain_community/vectorstores/faiss.py b/libs/community/langchain_community/vectorstores/faiss.py
index f12226eeb83ab..32fe798bee9d5 100644
--- a/libs/community/langchain_community/vectorstores/faiss.py
+++ b/libs/community/langchain_community/vectorstores/faiss.py
@@ -288,7 +288,14 @@ def __add(
         _len_check_if_sized(texts, ids, "texts", "ids")
 
         _metadatas = metadatas or ({} for _ in texts)
+<<<<<<< HEAD
         documents = [Document(id=id_, page_content=t, metadata=m) for id_, t, m in zip(ids, texts, _metadatas)]
+=======
+        documents = [
+            Document(id=id_, page_content=t, metadata=m)
+            for id_, t, m in zip(ids, texts, _metadatas)
+        ]
+>>>>>>> a699b69385b8781f8465316bf17eb35dfb1562d0
 
         _len_check_if_sized(documents, embeddings, "documents", "embeddings")