Resolve merge conflict in .gitattributes and update .gitignore for improved clarity

.gitattributes

@@ -35,6 +35,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+<<<<<<< HEAD
 
 # Vector store files
 *.faiss filter=lfs diff=lfs merge=lfs -text
@@ -42,3 +43,36 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 
 # Chat history
 chat_history/*.json filter=lfs diff=lfs merge=lfs -text
+=======
+# Audio files - uncompressed
+*.pcm filter=lfs diff=lfs merge=lfs -text
+*.sam filter=lfs diff=lfs merge=lfs -text
+*.raw filter=lfs diff=lfs merge=lfs -text
+# Audio files - compressed
+*.aac filter=lfs diff=lfs merge=lfs -text
+*.flac filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
+*.ogg filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+# Image files - uncompressed
+*.bmp filter=lfs diff=lfs merge=lfs -text
+*.gif filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.tiff filter=lfs diff=lfs merge=lfs -text
+# Image files - compressed
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
+*.webp filter=lfs diff=lfs merge=lfs -text
+# Video files - compressed
+*.mp4 filter=lfs diff=lfs merge=lfs -text
+*.webm filter=lfs diff=lfs merge=lfs -text
+vector_store/index.faiss filter=lfs diff=lfs merge=lfs -text
+vector_store/archive/index_20250326_170419.faiss filter=lfs diff=lfs merge=lfs -text
+vector_store/archive/index_20250327_003009.faiss filter=lfs diff=lfs merge=lfs -text
+vector_store/archive/index_20250327_014350.faiss filter=lfs diff=lfs merge=lfs -text
+vector_store/archive/index_20250327_123936.faiss filter=lfs diff=lfs merge=lfs -text
+vector_store/archive/index_20250327_124336.faiss filter=lfs diff=lfs merge=lfs -text
+vector_store/archive/index_20250327_134810.faiss filter=lfs diff=lfs merge=lfs -text
+vector_store/archive/index_20250327_140709.faiss filter=lfs diff=lfs merge=lfs -text
+vector_store/archive/index_20250327_141318.faiss filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 1227bb58cb66f0669c27bd271ec321d40241c893

.gitignore

@@ -24,4 +24,4 @@ ENV/
 
 # IDE specific
 .vscode/
-.idea/
+.idea/