diff --git a/.gitattributes b/.gitattributes
index 213afef..a9d5377 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,6 +6,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.bin.* filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 =======
@@ -32,6 +33,10 @@
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
+=======
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 0cd74e7542cd50b93d36b82f9ef19cd8156a7baa
 *.ftz filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.h5 filter=lfs diff=lfs merge=lfs -text
@@ -42,6 +47,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.model filter=lfs diff=lfs merge=lfs -text
 *.msgpack filter=lfs diff=lfs merge=lfs -text
 =======
@@ -53,6 +59,8 @@
 >>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
 =======
 >>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
+=======
+>>>>>>> 0cd74e7542cd50b93d36b82f9ef19cd8156a7baa
 *.mlmodel filter=lfs diff=lfs merge=lfs -text
 *.model filter=lfs diff=lfs merge=lfs -text
 *.msgpack filter=lfs diff=lfs merge=lfs -text
@@ -63,6 +71,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
 =======
 >>>>>>> 80ce3b281755c6eccc6c69262e80a4f9f2769bb4
@@ -75,6 +84,8 @@
 >>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
 =======
 >>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
+=======
+>>>>>>> 0cd74e7542cd50b93d36b82f9ef19cd8156a7baa
 *.onnx filter=lfs diff=lfs merge=lfs -text
 *.ot filter=lfs diff=lfs merge=lfs -text
 *.parquet filter=lfs diff=lfs merge=lfs -text
@@ -84,6 +95,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
@@ -126,6 +138,8 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
 >>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
 =======
 >>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
+=======
+>>>>>>> 0cd74e7542cd50b93d36b82f9ef19cd8156a7baa
 *.pickle filter=lfs diff=lfs merge=lfs -text
 *.pkl filter=lfs diff=lfs merge=lfs -text
 *.pt filter=lfs diff=lfs merge=lfs -text
@@ -146,6 +160,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
@@ -164,3 +179,6 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 0b55b1d5de1cbf96204013f5549fe162af1bd0b4
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 0cd74e7542cd50b93d36b82f9ef19cd8156a7baa