diff --git a/.gitattributes b/.gitattributes
index 39e7ae7..1744764 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -32,4 +32,9 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.xz 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
\ No newline at end of file
+<<<<<<< HEAD
+*tfevents* filter=lfs diff=lfs merge=lfs -text
+=======
+*tfevents* filter=lfs diff=lfs merge=lfs -text
+*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 2cad9072b8ca582cd60b059b2e34a96bf2112710