diff --git a/.gitignore b/.gitignore
index d256013d2..71b340ea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,14 @@
 .prod.env
 cognee/.data/
 
+<<<<<<< HEAD
 *.lance/
 .DS_Store
+=======
+
+.DS_Store
+
+>>>>>>> dd11da9 (Rebase onto main)
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
diff --git a/cognee/infrastructure/engine/.DS_Store b/cognee/infrastructure/engine/.DS_Store
deleted file mode 100644
index 5008ddfcf..000000000
Binary files a/cognee/infrastructure/engine/.DS_Store and /dev/null differ
diff --git a/cognee/modules/data/processing/document_types/.DS_Store b/cognee/modules/data/processing/document_types/.DS_Store
deleted file mode 100644
index a12500127..000000000
Binary files a/cognee/modules/data/processing/document_types/.DS_Store and /dev/null differ
diff --git a/cognee/tasks/chunks/.DS_Store b/cognee/tasks/chunks/.DS_Store
deleted file mode 100644
index a12500127..000000000
Binary files a/cognee/tasks/chunks/.DS_Store and /dev/null differ
diff --git a/cognee/tests/.DS_Store b/cognee/tests/.DS_Store
deleted file mode 100644
index 5e1362541..000000000
Binary files a/cognee/tests/.DS_Store and /dev/null differ