diff --git a/.gitignore b/.gitignore
index bed0972..5dfc71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-build/
-output/
-=======
 .vscode
 build
 output
 research
->>>>>>> Add .gitignore