diff --git a/.gitattributes b/.gitattributes
index 785802a..4380dbf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,7 @@
 *.arrow filter=lfs diff=lfs merge=lfs -text
 *.bin filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.bin.* filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 =======
@@ -12,30 +13,41 @@
 =======
 >>>>>>> 80ce3b281755c6eccc6c69262e80a4f9f2769bb4
 >>>>>>> 7c84acf19ee86840ddaa42b8ffe9655019d3618e
+=======
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
 *.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
+<<<<<<< HEAD
 *.model filter=lfs diff=lfs merge=lfs -text
 *.msgpack filter=lfs diff=lfs merge=lfs -text
 =======
+=======
+>>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
 *.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
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
 =======
 >>>>>>> 80ce3b281755c6eccc6c69262e80a4f9f2769bb4
 >>>>>>> 7c84acf19ee86840ddaa42b8ffe9655019d3618e
+=======
+>>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
 *.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
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.pt filter=lfs diff=lfs merge=lfs -text
 *.pth filter=lfs diff=lfs merge=lfs -text
 *.rar filter=lfs diff=lfs merge=lfs -text
@@ -70,6 +82,8 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 
 tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
+=======
+>>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
 *.pickle filter=lfs diff=lfs merge=lfs -text
 *.pkl filter=lfs diff=lfs merge=lfs -text
 *.pt filter=lfs diff=lfs merge=lfs -text
@@ -86,9 +100,13 @@ 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
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
 =======
 >>>>>>> 80ce3b281755c6eccc6c69262e80a4f9f2769bb4
 >>>>>>> 7c84acf19ee86840ddaa42b8ffe9655019d3618e
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee