diff --git a/.gitignore b/.gitignore
index ed8f93c683..5f3c9db7f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 *.swp
 *.swo
 vendor
@@ -10,8 +11,6 @@ examples/basecoin/glide.lock
 examples/basecoin/app/data
 baseapp/data/*
 docs/_build
-<<<<<<< HEAD
-<<<<<<< HEAD
 .DS_Store
 coverage.txt
 profile.out