--- a/mercurial/templatekw.py	Mon May 18 12:45:45 2020 -0400
+++ b/mercurial/templatekw.py	Mon May 18 14:59:59 2020 -0400
@@ -419,9 +419,9 @@
     else:
         merge_nodes = cache.get(b'merge_nodes')
         if merge_nodes is None:
-            from . import merge
+            from . import mergestate as mergestatemod
 
-            mergestate = merge.mergestate.read(repo)
+            mergestate = mergestatemod.mergestate.read(repo)
             if mergestate.active():
                 merge_nodes = (mergestate.local, mergestate.other)
             else: