diff --git a/.gitignore b/.gitignore
index 5d51dee..d1fb209 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,9 @@
 .RData
 .Ruserdata
 .codex
+<<<<<<< Updated upstream
+=======
+.env
+.vscode
+.DS_Store
+>>>>>>> Stashed changes