diff --git a/.gitattributes b/.gitattributes
index f8a40ba..1ec6729 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -35,6 +35,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
@@ -42,3 +43,6 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 3de6aefa6c8678b9cf319bd0de4fd0f4dc34a26f
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 97759d8abd5d229504cefdc03128dc5a7a58079a