diff --git a/.gitattributes b/.gitattributes
index d2010e4..bccee4d 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
 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
+=======
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
 *.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
 =======
 =======
 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
+=======
+>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
 *.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
 >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352
 =======
 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
+=======
+>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
 *.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
@@ -77,6 +89,8 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
 =======
 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
+=======
+>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
 *.pickle filter=lfs diff=lfs merge=lfs -text
 *.pkl filter=lfs diff=lfs merge=lfs -text
 *.pt filter=lfs diff=lfs merge=lfs -text
@@ -94,8 +108,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
 >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d