From 02cb45c3cb85f87b69bcd6fdebd906f951c51e8c Mon Sep 17 00:00:00 2001
From: Michael Lively <t-mlively@microsoft.com>
Date: Tue, 23 Aug 2022 16:10:56 -0700
Subject: [PATCH] demo merge conflict

---
 extensions/ipynb/src/notebookImagePaste.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/ipynb/src/notebookImagePaste.ts b/extensions/ipynb/src/notebookImagePaste.ts
index 1ec24e018a4..aebdb4555ac 100644
--- a/extensions/ipynb/src/notebookImagePaste.ts
+++ b/extensions/ipynb/src/notebookImagePaste.ts
@@ -124,7 +124,7 @@ function encodeBase64(buffer: Uint8Array, padded = true, urlSafe = false) {
 }
 
 function buildMetadata(b64: string, cell: vscode.NotebookCell, filename: string, filetype: string, startingAttachments: any): { [key: string]: any } {
-	const outputMetadata = { ...cell.metadata };
+	const outputMetadata = {};
 
 	if (!outputMetadata.custom) {
 		outputMetadata['custom'] = { 'attachments': { [filename]: { 'image/png': b64 } } };