diff --git a/.gitattributes b/.gitattributes
index c082710..8ea7ae0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
@@ -14,6 +15,9 @@
 =======
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
+=======
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> df30393a31e07a5b8976b353e19491101c276854
 *.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 +40,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.tar.* filter=lfs diff=lfs merge=lfs -text
 =======
@@ -43,17 +48,22 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
 =======
 >>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
+=======
+>>>>>>> df30393a31e07a5b8976b353e19491101c276854
 *.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
+<<<<<<< HEAD
 >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
 =======
 >>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
 =======
 >>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
+=======
+>>>>>>> df30393a31e07a5b8976b353e19491101c276854
 *.tflite filter=lfs diff=lfs merge=lfs -text
 *.tgz filter=lfs diff=lfs merge=lfs -text
 *.wasm filter=lfs diff=lfs merge=lfs -text
@@ -64,6 +74,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< 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
@@ -77,3 +88,6 @@ tf_model.h5 filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> df30393a31e07a5b8976b353e19491101c276854