From 8f784b5dd05ce177012c3a49d3e4aaed83589bc9 Mon Sep 17 00:00:00 2001
From: Kudryavcev Nikolay <kydry.nikolau@gmail.com>
Date: Sun, 29 Jun 2025 21:11:29 +0300
Subject: [PATCH] fix merge conflicts

Signed-off-by: Kudryavcev Nikolay <kydry.nikolau@gmail.com>
---
 syft/internal/fileresolver/directory.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syft/internal/fileresolver/directory.go b/syft/internal/fileresolver/directory.go
index 7a53b14bb..ec529a136 100644
--- a/syft/internal/fileresolver/directory.go
+++ b/syft/internal/fileresolver/directory.go
@@ -173,12 +173,12 @@ loop:
 			})
 		}
 
-		d.chroot = r.chroot
+		d.Chroot = r.Chroot
 		d.realPath = currentArchivePath.realPath
 		d.accessPath = currentArchivePath.accessPath
 		d.archiveRealPath = archiveDestinationPath
 
-		r.archives = append(r.archives, &d.filetreeResolver)
+		r.archives = append(r.archives, &d.FiletreeResolver)
 	}
 
 	return nil