diff --git a/.gitignore b/.gitignore
index 97bb489..98a8f01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 xar-1.5.2.tar.gz
+<<<<<<< HEAD
+/xar-xar-1.6.1.tar.gz
+=======
 /xar-417.1.tar.gz
+>>>>>>> master