diff --git a/.gitattributes b/.gitattributes
index c5eec4a..393f9e7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,9 +3,13 @@
 *.bin filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 *.ckpt filter=lfs diff=lfs merge=lfs -text
 >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
+=======
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
 *.ftz filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.h5 filter=lfs diff=lfs merge=lfs -text
@@ -26,14 +30,20 @@
 *.pth filter=lfs diff=lfs merge=lfs -text
 *.rar filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
+<<<<<<< HEAD
 saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.tar.* filter=lfs diff=lfs merge=lfs -text
 =======
+=======
+>>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
 *.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
 >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
+=======
+>>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
 *.tflite filter=lfs diff=lfs merge=lfs -text
 *.tgz filter=lfs diff=lfs merge=lfs -text
 *.wasm filter=lfs diff=lfs merge=lfs -text
@@ -42,6 +52,7 @@ 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
 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
@@ -49,3 +60,6 @@ tf_model.h5 filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125