From ab5a3bda0031976d5db9217b468dd6f201508e31 Mon Sep 17 00:00:00 2001
From: Luke Donahue <luke@expensify.com>
Date: Fri, 19 Mar 2021 14:28:50 -0700
Subject: [PATCH] swapped lodash.merge for lodash/merge

---
 lib/Onyx.js       |  2 +-
 package-lock.json | 12 +++---------
 package.json      |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/Onyx.js b/lib/Onyx.js
index 93cb691ce..b1a0644df 100644
--- a/lib/Onyx.js
+++ b/lib/Onyx.js
@@ -1,7 +1,7 @@
 import _ from 'underscore';
 import AsyncStorage from '@react-native-community/async-storage';
 import Str from 'expensify-common/lib/str';
-import lodashMerge from 'lodash.merge';
+import lodashMerge from 'lodash/merge';
 import {registerLogger, logInfo, logAlert} from './Logger';
 
 // Keeps track of the last connectionID that was used so we can keep incrementing it
diff --git a/package-lock.json b/package-lock.json
index 08dec98f2..38c3d4d31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8856,15 +8856,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.sortby": {
       "version": "4.7.0",
diff --git a/package.json b/package.json
index a2297b9aa..9215ff113 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@react-native-community/async-storage": "^1.12.1",
     "expensify-common": "git+https://github.com/Expensify/expensify-common.git#c7becaa79e10c10da521261ebb83dd3871847e84",
-    "lodash.merge": "^4.6.2",
+    "lodash": "4.17.21",
     "react": "^16.13.1",
     "underscore": "^1.11.0"
   },