diff --git a/.gitignore b/.gitignore
index 1eb956f..caa2840 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 .amake
+<<<<<<< HEAD
 .gch
 ~*
 
+=======
+>>>>>>> 95b7ed7323809929eba7b3b2a5185d73b4242877