diff --git a/lib/modules/ens/index.js b/lib/modules/ens/index.js
index 5be206aa..0dc32f61 100644
--- a/lib/modules/ens/index.js
+++ b/lib/modules/ens/index.js
@@ -410,3 +410,5 @@ class ENS {
 }
 
 module.exports = ENS;
+
+
diff --git a/lib/modules/ens/register.js b/lib/modules/ens/register.js
index d535e19a..21fc7047 100644
--- a/lib/modules/ens/register.js
+++ b/lib/modules/ens/register.js
@@ -3,7 +3,11 @@ const namehash = require('eth-ens-namehash');
 // Price of ENS registration contract functions
 const ENS_GAS_PRICE = 700000;
 
+<<<<<<< HEAD
 function registerSubDomain(ens, registrar, resolver, defaultAccount, subdomain, rootDomain, reverseNode, address, logger, secureSend, callback) {
+=======
+function registerSubDomain(ens, registrar, resolver, defaultAccount, subdomain, rootDomain, reverseNode, address, callback) {
+>>>>>>> if no register config, dont register anything
   const subnode = namehash.hash(subdomain);
   const rootNode = namehash.hash(rootDomain);
   const node = namehash.hash(`${subdomain}.${rootDomain}`);