diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt
index d07e377f1904..8bc229a79dfb 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt
@@ -23,7 +23,7 @@ class DefaultChangesGroupingPolicy(val project: Project, val model: DefaultTreeM
         it.markAsHelperNode()
 
         model.insertNodeInto(it, subtreeRoot, subtreeRoot.childCount)
-        CONFLICTS_NODE_CACHE[subtreeRoot] = it
+        CONFLICTS_NODE_CACHE[cachingRoot] = it
         TreeModelBuilder.IS_CACHING_ROOT.set(it, true)
       }
     }