diff --git a/.gitattributes b/.gitattributes
index 393f9e7..c082710 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,12 +4,16 @@
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
 =======
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
+=======
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
 *.ftz filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.h5 filter=lfs diff=lfs merge=lfs -text
@@ -31,19 +35,25 @@
 *.rar filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.tar.* filter=lfs diff=lfs merge=lfs -text
 =======
 =======
 >>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
+=======
+>>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
 *.safetensors filter=lfs diff=lfs merge=lfs -text
 saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.tar.* filter=lfs diff=lfs merge=lfs -text
 *.tar filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
 =======
 >>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
+=======
+>>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
 *.tflite filter=lfs diff=lfs merge=lfs -text
 *.tgz filter=lfs diff=lfs merge=lfs -text
 *.wasm filter=lfs diff=lfs merge=lfs -text
@@ -53,6 +63,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 model.safetensors filter=lfs diff=lfs merge=lfs -text
 flax_model.msgpack filter=lfs diff=lfs merge=lfs -text
 pytorch_model.bin filter=lfs diff=lfs merge=lfs -text
@@ -63,3 +74,6 @@ tf_model.h5 filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f