diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js
index bcb6dcce..dc17da8b 100644
--- a/lib/cmds/blockchain/blockchain.js
+++ b/lib/cmds/blockchain/blockchain.js
@@ -87,18 +87,10 @@ Blockchain.prototype.setupProxy = function() {
 
   let ipcObject = new Ipc({ipcRole: 'client'});
 
-<<<<<<< HEAD
   proxy.serve(ipcObject, this.config.rpcHost, this.config.rpcPort, false);
   proxy.serve(ipcObject, this.config.wsHost, this.config.wsPort, true);
-  this.config.rpcPort += 10;
-  this.config.wsPort += 10;
-=======
-    proxy.serve(ipcObject, this.config.rpcHost, this.config.rpcPort, false);
-    proxy.serve(ipcObject, this.config.wsHost, this.config.wsPort, true);
-    this.config.rpcPort += constants.blockchain.servicePortOnProxy;
-    this.config.wsPort += constants.blockchain.servicePortOnProxy;
-  }
->>>>>>> Changes based on code review
+  this.config.rpcPort += constants.blockchain.servicePortOnProxy;
+  this.config.wsPort += constants.blockchain.servicePortOnProxy;
 };
 
 Blockchain.prototype.runCommand = function(cmd, options, callback) {