diff --git a/.gitignore b/.gitignore
index ba64d0b..31e0c50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 /build/
 /install/
 /log/
-/.idea/
\ No newline at end of file
+<<<<<<< HEAD
+/.idea/
+=======
+.idea
+>>>>>>> origin/main