From b8eeab2e35a51cb8128d2a0df23d8ecd489208cd Mon Sep 17 00:00:00 2001
From: Bartholomew <mackintosh02@gmail.com>
Date: Fri, 10 Apr 2020 22:50:05 +0100
Subject: [PATCH] fix: enable merge option for yaml parser (#3577)

---
 packages/netlify-cms-core/src/actions/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/netlify-cms-core/src/actions/config.js b/packages/netlify-cms-core/src/actions/config.js
index bdf2e98c..4563c25a 100644
--- a/packages/netlify-cms-core/src/actions/config.js
+++ b/packages/netlify-cms-core/src/actions/config.js
@@ -119,7 +119,7 @@ function mergePreloadedConfig(preloadedConfig, loadedConfig) {
 }
 
 function parseConfig(data) {
-  const config = yaml.parse(data, { maxAliasCount: -1, prettyErrors: true });
+  const config = yaml.parse(data, { maxAliasCount: -1, prettyErrors: true, merge: true });
   if (typeof CMS_ENV === 'string' && config[CMS_ENV]) {
     Object.keys(config[CMS_ENV]).forEach(key => {
       config[key] = config[CMS_ENV][key];