diff --git a/html/js/config.js b/html/js/config.js
index 784a9c3..dea296a 100755
--- a/html/js/config.js
+++ b/html/js/config.js
@@ -1,4 +1,8 @@
 var config = {
+<<<<<<< HEAD
+=======
+    //apiUrl: "http://0.0.0.0:1984/",
+>>>>>>> master
     apiUrl: "http://127.0.0.1:1984/",
     mainnetExplorerUrl: "https://xmrchain.com/",
     testnetExplorerUrl: "https://testnet.xmrchain.com/",