diff --git a/hgext/fix.py b/hgext/fix.py
--- a/hgext/fix.py
+++ b/hgext/fix.py
@@ -144,7 +144,6 @@
     match as matchmod,
     mdiff,
     merge,
-    mergestate as mergestatemod,
     pycompat,
     registrar,
     rewriteutil,
@@ -433,9 +432,7 @@
     if not (len(revs) == 1 and wdirrev in revs):
         cmdutil.checkunfinished(repo)
         rewriteutil.precheck(repo, revs, b'fix')
-    if wdirrev in revs and list(
-        mergestatemod.mergestate.read(repo).unresolved()
-    ):
+    if wdirrev in revs and list(repo[wdirrev].mergestate().unresolved()):
         raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
     if not revs:
         raise error.Abort(