diff --git a/.gitignore b/.gitignore
index 2e51a97..bed0972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,9 @@
+<<<<<<< HEAD
 build/
-output/
\ No newline at end of file
+output/
+=======
+.vscode
+build
+output
+research
+>>>>>>> Add .gitignore