diff --git a/cmd/lakefs/cmd/run.go b/cmd/lakefs/cmd/run.go
index 29ebfa9f3cb..e07c376ca17 100644
--- a/cmd/lakefs/cmd/run.go
+++ b/cmd/lakefs/cmd/run.go
@@ -156,7 +156,7 @@ var runCmd = &cobra.Command{
 			Config:            cfg,
 			KVStore:           kvStore,
 			PathProvider:      upload.DefaultPathProvider,
-			ConflictResolvers: catalogfactory.BuildConflictResolvers(blockStore),
+			ConflictResolvers: catalogfactory.BuildConflictResolvers(cfg, blockStore),
 		}
 
 		c, err := catalog.New(ctx, catalogConfig)
diff --git a/modules/catalog/factory/build.go b/modules/catalog/factory/build.go
index 87e5037ddbf..f421062a154 100644
--- a/modules/catalog/factory/build.go
+++ b/modules/catalog/factory/build.go
@@ -2,9 +2,10 @@ package factory
 
 import (
 	"github.com/treeverse/lakefs/pkg/block"
+	"github.com/treeverse/lakefs/pkg/config"
 	"github.com/treeverse/lakefs/pkg/graveler"
 )
 
-func BuildConflictResolvers(block block.Adapter) []graveler.ConflictResolver {
+func BuildConflictResolvers(cfg config.Config, block block.Adapter) []graveler.ConflictResolver {
 	return nil
 }
diff --git a/pkg/loadtest/local_load_test.go b/pkg/loadtest/local_load_test.go
index 728264d181e..e5e8ad97e78 100644
--- a/pkg/loadtest/local_load_test.go
+++ b/pkg/loadtest/local_load_test.go
@@ -67,7 +67,7 @@ func TestLocalLoad(t *testing.T) {
 		Config:            cfg,
 		KVStore:           kvStore,
 		PathProvider:      upload.DefaultPathProvider,
-		ConflictResolvers: catalogfactory.BuildConflictResolvers(blockAdapter),
+		ConflictResolvers: catalogfactory.BuildConflictResolvers(cfg, blockAdapter),
 	})
 	testutil.MustDo(t, "build catalog", err)