Merge pull request #9 from emberjs/dependabot/npm_and_yarn/merge-1.2.1

Author: dependabot[bot]

yarn.lock

@@ -4221,8 +4221,8 @@ merge-trees@^1.0.1:
     symlink-or-copy "^1.0.0"
 
 merge@^1.1.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
 
 methods@~1.1.2:
   version "1.1.2"