diff --git a/.gitignore b/.gitignore
index ade6b3e..b6bc453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ sync.ffs_lock
 .env
 .env.anna
 .env.forust
+.env.*
+.env.*example
 
 # Volumes and data directories
 gitea/gitea-db/
@@ -71,3 +73,9 @@ replacements.txt
 # Misc
 .DS_Store
 .idea
+<<<<<<< HEAD
+=======
+
+# Temp files
+edu_master/temp/
+>>>>>>> 1abf4a7 (chore: gitignored temp folder for references)