diff --git a/.gitattributes b/.gitattributes
index 4380dbf..534da80 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,6 +3,7 @@
 *.bin filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.bin.* filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 =======
@@ -17,6 +18,10 @@
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
+=======
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
 *.ftz filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.h5 filter=lfs diff=lfs merge=lfs -text
@@ -24,11 +29,14 @@
 *.lfs.* filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.model filter=lfs diff=lfs merge=lfs -text
 *.msgpack filter=lfs diff=lfs merge=lfs -text
 =======
 =======
 >>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
+=======
+>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
 *.mlmodel filter=lfs diff=lfs merge=lfs -text
 *.model filter=lfs diff=lfs merge=lfs -text
 *.msgpack filter=lfs diff=lfs merge=lfs -text
@@ -36,18 +44,22 @@
 *.npz filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
 =======
 >>>>>>> 80ce3b281755c6eccc6c69262e80a4f9f2769bb4
 >>>>>>> 7c84acf19ee86840ddaa42b8ffe9655019d3618e
 =======
 >>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
+=======
+>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
 *.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
+<<<<<<< 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
@@ -84,6 +96,8 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
 =======
 >>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
+=======
+>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
 *.pickle filter=lfs diff=lfs merge=lfs -text
 *.pkl filter=lfs diff=lfs merge=lfs -text
 *.pt filter=lfs diff=lfs merge=lfs -text
@@ -101,6 +115,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
@@ -110,3 +125,6 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662