diff --git a/package-lock.json b/package-lock.json
index 81369a0..6730a34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
         "lodash.flatten": "^4.4.0",
         "Logger": "0.0.0",
         "macaddress": "^0.2.9",
-        "merge": "^1.2.1",
+        "merge": "^2.1.1",
         "mime": "^2.4.0",
         "react": "^16.7.0",
         "react-dev-utils": "^7.0.1",
@@ -10809,9 +10809,9 @@
       }
     },
     "node_modules/merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
     },
     "node_modules/merge-deep": {
       "version": "3.0.2",
@@ -13537,7 +13537,8 @@
     "node_modules/promise-ftp-common": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz",
-      "integrity": "sha1-tPgIKnQDVkdwNQZ2PtsUIw2YZdo="
+      "integrity": "sha1-tPgIKnQDVkdwNQZ2PtsUIw2YZdo=",
+      "peer": true
     },
     "node_modules/promise-ftp/node_modules/bluebird": {
       "version": "2.11.0",
@@ -27997,9 +27998,9 @@
       }
     },
     "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
     },
     "merge-deep": {
       "version": "3.0.2",
@@ -30254,8 +30255,7 @@
       "integrity": "sha512-v368jPSqzmjjKDIyggulC+dRFcpAOEX7aFdEWkFYQp8Ao3P2N4Y6XnFFdKgK7PtkylwvGQkZR/65HZuzmq0V7A==",
       "requires": {
         "@icetee/ftp": "^0.3.15",
-        "bluebird": "2.x",
-        "promise-ftp-common": "^1.1.5"
+        "bluebird": "2.x"
       },
       "dependencies": {
         "bluebird": {
@@ -30268,7 +30268,8 @@
     "promise-ftp-common": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz",
-      "integrity": "sha1-tPgIKnQDVkdwNQZ2PtsUIw2YZdo="
+      "integrity": "sha1-tPgIKnQDVkdwNQZ2PtsUIw2YZdo=",
+      "peer": true
     },
     "promise-inflight": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 057979e..dd8a6c4 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "lodash.flatten": "^4.4.0",
     "Logger": "0.0.0",
     "macaddress": "^0.2.9",
-    "merge": "^1.2.1",
+    "merge": "^2.1.1",
     "mime": "^2.4.0",
     "react": "^16.7.0",
     "react-dev-utils": "^7.0.1",