diff --git a/.gitattributes b/.gitattributes
index 3d16beb..9db9640 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
 =======
@@ -13,6 +14,10 @@
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
+=======
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 4eac624f7c87a76518ff99846a877e0293c18d77
 *.ftz filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.h5 filter=lfs diff=lfs merge=lfs -text
@@ -20,26 +25,33 @@
 *.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
 =======
 =======
 >>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
+=======
+>>>>>>> 4eac624f7c87a76518ff99846a877e0293c18d77
 *.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
 >>>>>>> f934ea452e1fc5615336b11e0c4dc5a9b5230a0b
 =======
 >>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
+=======
+>>>>>>> 4eac624f7c87a76518ff99846a877e0293c18d77
 *.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
@@ -78,6 +90,8 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
 =======
 >>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
+=======
+>>>>>>> 4eac624f7c87a76518ff99846a877e0293c18d77
 *.pickle filter=lfs diff=lfs merge=lfs -text
 *.pkl filter=lfs diff=lfs merge=lfs -text
 *.pt filter=lfs diff=lfs merge=lfs -text
@@ -95,8 +109,12 @@ 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
 >>>>>>> f934ea452e1fc5615336b11e0c4dc5a9b5230a0b
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 4eac624f7c87a76518ff99846a877e0293c18d77