diff --git a/cfg/dev.js b/cfg/dev.js
index 3710704..e9ef819 100644
--- a/cfg/dev.js
+++ b/cfg/dev.js
@@ -7,7 +7,7 @@ var baseConfig = require('./base');
 // Add needed plugins here
 var BowerWebpackPlugin = require('bower-webpack-plugin');
 
-var config = _.merge(baseConfig, {
+var config = _.merge({
   entry: [
     'webpack-dev-server/client?http://127.0.0.1:8000',
     'webpack/hot/only-dev-server',
@@ -22,7 +22,7 @@ var config = _.merge(baseConfig, {
       searchResolveModulesDirectories: false
     })
   ]
-});
+}, baseConfig);
 
 // Add needed loaders
 config.module.loaders.push({
diff --git a/cfg/dist.js b/cfg/dist.js
index a105bf8..23fccf2 100644
--- a/cfg/dist.js
+++ b/cfg/dist.js
@@ -7,7 +7,7 @@ var baseConfig = require('./base');
 // Add needed plugins here
 var BowerWebpackPlugin = require('bower-webpack-plugin');
 
-var config = _.merge(baseConfig, {
+var config = _.merge({
   entry: path.join(__dirname, '../src/components/run'),
   cache: false,
   devtool: 'sourcemap',
@@ -24,7 +24,7 @@ var config = _.merge(baseConfig, {
     new webpack.optimize.AggressiveMergingPlugin(),
     new webpack.NoErrorsPlugin()
   ]
-});
+}, baseConfig);
 
 config.module.loaders.push({
   test: /\.(js|jsx)$/,