diff --git a/.gitattributes b/.gitattributes
index 586a1ee..f8a40ba 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -34,7 +34,11 @@ 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
 tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 661430ca7995e337eac4aff9b58cc23d486c3a64
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 3de6aefa6c8678b9cf319bd0de4fd0f4dc34a26f