diff --git a/.gitignore b/.gitignore
index a7f06de..a40ea75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@
 *.log
 tmp/
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 6231dc6 (Add gitignore)
 custom.el