fix merged conflicts

_data/merchants.yml

@@ -14,8 +14,10 @@
       url: https://www.coincut.com
     - name: Cryptopia
       url: https://www.cryptopia.co.nz/Exchange?market=XMR_BTC
-+   - name: Livecoin (BTC and USD trading pairs)
-+     url: https://www.livecoin.net
+    - name: Livecoin (BTC and USD trading pairs)
+      url: https://www.livecoin.net
+    - name: LiteBit (Bankwire/GiroPay/iDeal/SOFORT)
+      url: https://www.litebit.eu/en/buy/monero
     - name: Poloniex
       url: https://poloniex.com/exchange/btc_xmr
     - name: ShapeShift (Instant)