diff --git a/package.json b/package.json
old mode 100755
new mode 100644
index eca79686..859f0d10
--- a/package.json
+++ b/package.json
@@ -216,7 +216,7 @@
     "jest": "24.8.0",
     "jsdom": "15.1.0",
     "lodash.debounce": "4.0.8",
-    "merge": "1.2.1",
+    "merge": "2.1.1",
     "mini-css-extract-plugin": "0.6.0",
     "minimist": "1.2.0",
     "monaco-editor": "0.16.2",
diff --git a/yarn.lock b/yarn.lock
index ab33ff61..c1a04fa7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9796,10 +9796,10 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
   integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
-merge@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+merge@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
+  integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
 
 methods@~1.1.2:
   version "1.1.2"