diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3c0192872..23b9976a5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-
-## [9.7.8](https://github.com/forcedotcom/source-deploy-retrieve/compare/9.7.7...9.7.8) (2023-08-27)
-
 ### Bug Fixes
 
-=======
-
 ## [9.7.27](https://github.com/forcedotcom/source-deploy-retrieve/compare/9.7.26...9.7.27) (2023-10-17)
 
 ### Bug Fixes
@@ -120,8 +114,6 @@
 
 ### Bug Fixes
 
-> > > > > > > main
-
 - **deps:** bump @salesforce/kit from 3.0.9 to 3.0.11 ([#1090](https://github.com/forcedotcom/source-deploy-retrieve/issues/1090)) ([17c4ef0](https://github.com/forcedotcom/source-deploy-retrieve/commit/17c4ef059d9f9585613c2ee6707ffe8449358600))
 
 ## [9.7.7](https://github.com/forcedotcom/source-deploy-retrieve/compare/9.7.6...9.7.7) (2023-08-22)
diff --git a/src/convert/transformers/staticResourceMetadataTransformer.ts b/src/convert/transformers/staticResourceMetadataTransformer.ts
index 08f7ea6faf..6c2e2e80ba 100644
--- a/src/convert/transformers/staticResourceMetadataTransformer.ts
+++ b/src/convert/transformers/staticResourceMetadataTransformer.ts
@@ -236,7 +236,7 @@ const componentIsExpandedArchive = async (component: SourceComponent): Promise<b
 async function getStaticResourceZip(component: SourceComponent, content: string): Promise<JSZip> {
   try {
     const staticResourceZip = await component.tree.readFile(content);
-    return await JSZip.loadAsync(staticResourceZip);
+    return await JSZip.loadAsync(staticResourceZip, { createFolders: true });
   } catch (e) {
     throw new SfError(`Unable to open zip file ${content} for ${component.name} (${component.xml})`, 'BadZipFile', [
       'Check that your file really is a valid zip archive',
diff --git a/src/resolve/treeContainers.ts b/src/resolve/treeContainers.ts
index 1d64f9cfb4..e7ad91b119 100644
--- a/src/resolve/treeContainers.ts
+++ b/src/resolve/treeContainers.ts
@@ -132,7 +132,7 @@ export class ZipTreeContainer extends TreeContainer {
   }
 
   public static async create(buffer: Buffer): Promise<ZipTreeContainer> {
-    const zip = await JSZip.loadAsync(buffer);
+    const zip = await JSZip.loadAsync(buffer, { createFolders: true });
     return new ZipTreeContainer(zip);
   }