diff --git a/.gitattributes b/.gitattributes
index 1ec6729..7166c15 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -36,6 +36,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
@@ -46,3 +47,6 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
 =======
 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
 >>>>>>> 97759d8abd5d229504cefdc03128dc5a7a58079a
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> fe72a1831b576e3ac465a43f5ea6eec63f0f3efe