From a55ff613bffc6d3dce3764dfc2ebc777d88d6364 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Mon, 20 Aug 2018 14:03:10 -0400
Subject: [PATCH] fix config

---
 lib/core/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/core/config.js b/lib/core/config.js
index 6582b205..192abfb4 100644
--- a/lib/core/config.js
+++ b/lib/core/config.js
@@ -54,11 +54,11 @@ Config.prototype.loadConfigFiles = function(options) {
 
   this.embarkConfig = fs.readJSONSync(options.embarkConfig);
   this.embarkConfig.plugins = this.embarkConfig.plugins || {};
-  this.loadEmbarkConfigFile();
 
   this.plugins = new Plugins({plugins: this.embarkConfig.plugins, logger: this.logger, interceptLogs: interceptLogs, events: this.events, config: this, context: this.context, env: this.env});
   this.plugins.loadPlugins();
 
+  this.loadEmbarkConfigFile();
   this.loadBlockchainConfigFile();
   this.loadStorageConfigFile();
   this.loadCommunicationConfigFile();
@@ -338,7 +338,7 @@ Config.prototype.loadEmbarkConfigFile = function() {
     }
   };
 
-  this.embarkConfig = this._mergeConfig(this.embarkConfig, configObject, true);
+  this.embarkConfig = utils.recursiveMerge(configObject, this.embarkConfig);
 
   const contracts = this.embarkConfig.contracts;
   const newContractsFiles = this.loadFiles(contracts);