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