diff --git a/.gitattributes b/.gitattributes
index 70779d9..213afef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.bin.* filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 =======
@@ -27,6 +28,10 @@
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
+=======
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
 *.ftz filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.h5 filter=lfs diff=lfs merge=lfs -text
@@ -36,6 +41,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.model filter=lfs diff=lfs merge=lfs -text
 *.msgpack filter=lfs diff=lfs merge=lfs -text
 =======
@@ -45,6 +51,8 @@
 >>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
 =======
 >>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
+=======
+>>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
 *.mlmodel filter=lfs diff=lfs merge=lfs -text
 *.model filter=lfs diff=lfs merge=lfs -text
 *.msgpack filter=lfs diff=lfs merge=lfs -text
@@ -54,6 +62,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
 =======
 >>>>>>> 80ce3b281755c6eccc6c69262e80a4f9f2769bb4
@@ -64,6 +73,8 @@
 >>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
 =======
 >>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
+=======
+>>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
 *.onnx filter=lfs diff=lfs merge=lfs -text
 *.ot filter=lfs diff=lfs merge=lfs -text
 *.parquet filter=lfs diff=lfs merge=lfs -text
@@ -72,6 +83,7 @@
 <<<<<<< HEAD
 <<<<<<< 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
@@ -112,6 +124,8 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
 >>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
 =======
 >>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
+=======
+>>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
 *.pickle filter=lfs diff=lfs merge=lfs -text
 *.pkl filter=lfs diff=lfs merge=lfs -text
 *.pt filter=lfs diff=lfs merge=lfs -text
@@ -131,6 +145,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
@@ -146,3 +161,6 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4