diff --git a/.gitignore b/.gitignore
index a40ea75..dd002f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,14 @@
 *.log
 tmp/
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 
 >>>>>>> 6231dc6 (Add gitignore)
+=======
+
+=======
+>>>>>>> 8ac4896 (Update)
+>>>>>>> 70fd802 (Update)
 custom.el