diff --cc builder/builder-next/executor_unix.go
index 29c9787798,cefbb8a56f..0000000000
--- a/builder/builder-next/executor_unix.go
+++ b/builder/builder-next/executor_unix.go
@@@ -25,10 -24,9 +25,14 @@@ import

  const networkName = "bridge"

++<<<<<<< HEAD
 +func newExecutor(root, cgroupParent string, net libnetwork.NetworkController, dnsConfig *oci.DNSConfig, rootless bool, idmap *idtools.IdentityMapping) (executor.Executor, error) {
 +      netRoot := filepath.Join(root, "net")
++=======
+ func newExecutor(root, cgroupParent string, net libnetwork.NetworkController, dnsConfig *oci.DNSConfig, rootless bool, idmap *idtools.IdentityMapping, apparmorProfile string) (executor.Executor, error) {
++>>>>>>> 611eb6ffb3 (buildkit: Apply apparmor profile)
        networkProviders := map[pb.NetMode]network.Provider{
 -              pb.NetMode_UNSET: &bridgeProvider{NetworkController: net, Root: filepath.Join(root, "net")},
 +              pb.NetMode_UNSET: &bridgeProvider{NetworkController: net, Root: netRoot},
                pb.NetMode_HOST:  network.NewHostProvider(),
                pb.NetMode_NONE:  network.NewNoneProvider(),
        }