Merge pull request bvaughn#367 from bvaughn/dependabot/npm_and_yarn/website/merge-1.2.1

Bump merge from 1.2.0 to 1.2.1 in /website

Author: Brian Vaughn

website/yarn.lock

@@ -6202,8 +6202,9 @@ merge-stream@^1.0.1:
  readable-stream "^2.0.1"
 
 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"
+ integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
 methods@~1.1.2:
  version "1.1.2"