diff --git a/.gitignore b/.gitignore
index cdf6d40..6e1651f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,8 +134,11 @@ dist/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+<<<<<<< HEAD
 
 # Jekyll
 _site/
 .sass-cache/
 .jekyll-metadata
+
+/.idea