diff --git a/.gitattributes b/.gitattributes
index 52373fe..586a1ee 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -33,4 +33,8 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+<<<<<<< HEAD
 tokenizer.json filter=lfs diff=lfs merge=lfs -text
+=======
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 661430ca7995e337eac4aff9b58cc23d486c3a64