Update cf_xarray/accessor.py

malmans2 · dcherian · web-flow · commit 06b92074f835 · 2021-05-27T11:00:59.000+01:00
Co-authored-by: Deepak Cherian &lt;dcherian@users.noreply.github.com&gt;
diff --git a/cf_xarray/accessor.py b/cf_xarray/accessor.py
@@ -1371,7 +1371,7 @@ def get_renamer_and_conflicts(keydict):
                     ours.update(keydict.get(k, {}).get("ours", []))
                     theirs.update(keydict.get(k, {}).get("theirs", []))
                     keydict[k] = dict(ours=list(ours), theirs=list(theirs))
-            renamer, conflicts = get_renamer_and_conflicts()
+            renamer, conflicts = get_renamer_and_conflicts(keydict)
 
         # Rename and warn
         if conflicts:
