diff --git a/.gitattributes b/.gitattributes
index 5371240..dc35052 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,13 +1,19 @@
 *.7z filter=lfs diff=lfs merge=lfs -text
 *.arrow filter=lfs diff=lfs merge=lfs -text
 *.bin filter=lfs diff=lfs merge=lfs -text
+<<<<<<< HEAD
 *.bin.* filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
+=======
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 563aa009c4cf9d2300140cab9d630294e9278a31
 *.ftz filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.h5 filter=lfs diff=lfs merge=lfs -text
 *.joblib filter=lfs diff=lfs merge=lfs -text
 *.lfs.* filter=lfs diff=lfs merge=lfs -text
+<<<<<<< HEAD
  
 *.msgpack filter=lfs diff=lfs merge=lfs -text
  
@@ -69,4 +75,32 @@ onnx/embed_tokens.onnx_data filter=lfs diff=lfs merge=lfs -text
 onnx/speech_encoder.onnx filter=lfs diff=lfs merge=lfs -text
 onnx/speech_encoder.onnx_data filter=lfs diff=lfs merge=lfs -text
 onnx/embed_tokens.onnx filter=lfs diff=lfs merge=lfs -text
-onnx/conditional_decoder.onnx filter=lfs diff=lfs merge=lfs -text
\ No newline at end of file
+onnx/conditional_decoder.onnx filter=lfs diff=lfs merge=lfs -text
+=======
+*.mlmodel filter=lfs diff=lfs merge=lfs -text
+*.model filter=lfs diff=lfs merge=lfs -text
+*.msgpack filter=lfs diff=lfs merge=lfs -text
+*.npy filter=lfs diff=lfs merge=lfs -text
+*.npz filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text
+*.ot filter=lfs diff=lfs merge=lfs -text
+*.parquet filter=lfs diff=lfs merge=lfs -text
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.pickle filter=lfs diff=lfs merge=lfs -text
+*.pkl filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.pth filter=lfs diff=lfs merge=lfs -text
+*.rar filter=lfs diff=lfs merge=lfs -text
+*.safetensors filter=lfs diff=lfs merge=lfs -text
+saved_model/**/* filter=lfs diff=lfs merge=lfs -text
+*.tar.* filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
+*.tflite filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.wasm filter=lfs diff=lfs merge=lfs -text
+*.xz 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
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 563aa009c4cf9d2300140cab9d630294e9278a31