From d614f5859d900bd842bd21001a7a1d833bbf38c6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 10:28:06 -0700
Subject: [PATCH] Fix bug in variable_map that was introduced during merge
 conflict resolving

---
 core/variable_map.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index 997a26e96..3725df516 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -152,7 +152,7 @@ VariableMap.prototype.renameVariableWithConflict_ = function(
   // Finally delete the original variable, which is now unreferenced.
   Events.fire(new (Events.get(Events.VAR_DELETE))(variable));
   // And remove it from the list.
-  utils.arrayRemove(this.getVariablesOfType(type), variable);
+  utils.arrayRemove(this.variableMap_[type], variable);
 };
 
 /* End functions for renaming variables. */