diff --git a/_data/merchants-stores.yml b/_data/merchants-stores.yml
index ace1e71..bb28241 100644
--- a/_data/merchants-stores.yml
+++ b/_data/merchants-stores.yml
@@ -129,10 +129,6 @@
   url: https://mywabo.com
   image: Wabo.png
 
-<<<<<<< HEAD
-=======
-
->>>>>>> ccee525... new merchant
 - name: Buy with Dash
   title: Buy with Dash
   url: http://www.buywithdash.org