From bb0a482365f49e386eaac2ee4ef1055fcff1090f Mon Sep 17 00:00:00 2001
From: Daan Reid <osmosisch@gmail.com>
Date: Mon, 25 Jan 2021 16:18:04 +0100
Subject: [PATCH] More merge fun

---
 webpack.local.dev.js | 2 +-
 webpack.local.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webpack.local.dev.js b/webpack.local.dev.js
index c6a3e3557..b5aad54be 100644
--- a/webpack.local.dev.js
+++ b/webpack.local.dev.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const merge = require('webpack-merge');
+const {merge} = require('webpack-merge');
 const common = require('./webpack.common.js');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 let fs = require('fs');
diff --git a/webpack.local.js b/webpack.local.js
index 9265ef9bb..00755386a 100644
--- a/webpack.local.js
+++ b/webpack.local.js
@@ -1,11 +1,11 @@
 'use strict';
-const merge = require('webpack-merge');
+const {merge} = require('webpack-merge');
 const prod = require('./webpack.prod');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 let fs = require('fs');
 
-module.exports = merge.smart(prod, {
+module.exports = merge(prod, {
   plugins: [
     new HtmlWebpackPlugin({
       filename: 'signin.html',