diff --git a/pkg/action/install.go b/pkg/action/install.go
index e1c957ca7..15ed0a055 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -113,6 +113,7 @@ type Install struct {
 	// TakeOwnership will ignore the check for helm annotations and take ownership of the resources.
 	TakeOwnership bool
 	// Also considers the state of custom resources and custom resource definitions in the cluster when adopting resources.
+	// TODO Helm 4: Remove this config and always merge custom resources
 	ThreeWayMergeForCustomResources bool
 	PostRenderer                    postrender.PostRenderer
 	// Lock to control raceconditions when the process receives a SIGTERM
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index a7d6944f7..8e2e37fed 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -45,7 +45,8 @@ type Rollback struct {
 	Force         bool // will (if true) force resource upgrade through uninstall/recreate if needed
 	CleanupOnFail bool
 	MaxHistory    int // MaxHistory limits the maximum number of revisions saved per release
-	// Also considers the state of custom resources and custom resource definitions in the cluster when upgrading (or adopting) resources.
+	// Also considers the state of custom resources and custom resource definitions in the cluster when downgrading resources.
+	// TODO Helm 4: Remove this config and always merge custom resources
 	ThreeWayMergeForCustomResources bool
 }
 
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index a50c007de..a2d9b84ea 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -120,6 +120,7 @@ type Upgrade struct {
 	// TakeOwnership will skip the check for helm annotations and adopt all existing resources.
 	TakeOwnership bool
 	// Also considers the state of custom resources and custom resource definitions in the cluster when upgrading (or adopting) resources.
+	// TODO Helm 4: Remove this config and always merge custom resources
 	ThreeWayMergeForCustomResources bool
 }