diff --git a/.gitignore b/.gitignore
index 0979dd1..065b4b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
 /go-cmp-0.2.0.tar.gz
-=======
 /go-cmp-0.3.0.tar.gz
->>>>>>> Initial import