From d3b4bc6e8eaa6d7e167bb28926977a437b26d2e1 Mon Sep 17 00:00:00 2001
From: Pedro Nauck <pedronauck@gmail.com>
Date: Wed, 27 Feb 2019 20:36:15 -0300
Subject: [PATCH] fix(load-cfg): merge default config on load

---
 other-packages/load-cfg/src/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/other-packages/load-cfg/src/index.ts b/other-packages/load-cfg/src/index.ts
index 293366820..658c7dcc0 100644
--- a/other-packages/load-cfg/src/index.ts
+++ b/other-packages/load-cfg/src/index.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs-extra'
 import * as path from 'path'
 import * as findup from 'find-up'
-import { merge } from 'lodash/fp'
+import { merge } from 'lodash'
 
 export const loadFile = (filepath: string, noCache?: boolean) => {
   require('@babel/register')({
@@ -51,7 +51,7 @@ export function load<C = any>(
   const file = filepath ? loadFile(filepath, noCache) : {}
   const next = defaultConfig
     ? deep
-      ? merge(file, defaultConfig)
+      ? merge(defaultConfig, file)
       : { ...defaultConfig, ...file }
     : file