From 986f51ed95e5a39666cf94dba62e62c7dc2f9a0e Mon Sep 17 00:00:00 2001
From: "Brandon Waterloo [MSFT]"
 <36966225+bwateratmsft@users.noreply.github.com>
Date: Fri, 7 Jan 2022 08:19:51 -0500
Subject: [PATCH] Allow merge keys (#79)

---
 .vscode/launch.json            | 1 +
 src/service/ComposeDocument.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3438d62..a2ec829 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -59,6 +59,7 @@
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}/src/test/clientExtension",
                 "--disable-extension=ms-azuretools.vscode-docker", // Keep the Docker extension from running so it doesn't interfere with testing
+                "--disable-extension=redhat.vscode-yaml", // Keep the YAML extension from running so it doesn't interfere with testing
             ],
             "preLaunchTask": "tsc-watch: client extension",
             "presentation": {
diff --git a/src/service/ComposeDocument.ts b/src/service/ComposeDocument.ts
index 194b45c..615b718 100644
--- a/src/service/ComposeDocument.ts
+++ b/src/service/ComposeDocument.ts
@@ -169,7 +169,7 @@ export class ComposeDocument {
     }
 
     private buildYamlDocument(): YamlDocument {
-        const composedTokens = new Composer().compose(this.fullCst.value, true);
+        const composedTokens = new Composer({ merge: true }).compose(this.fullCst.value, true);
         const [yamlDocument] = composedTokens;
 
         if (!isDocument(yamlDocument)) {