diff --git a/tools/mapmerge2/convert.py b/tools/mapmerge2/convert.py
index 35fa606834c..63fe8cbb9a0 100644
--- a/tools/mapmerge2/convert.py
+++ b/tools/mapmerge2/convert.py
@@ -4,4 +4,4 @@ from . import frontend, dmm
 if __name__ == '__main__':
     settings = frontend.read_settings()
     for fname in frontend.process(settings, "convert"):
-        dmm.DMM.from_file(fname).to_file(fname, settings.tgm)
+        dmm.DMM.from_file(fname).to_file(fname, tgm = settings.tgm)
diff --git a/tools/mapmerge2/fixup.py b/tools/mapmerge2/fixup.py
index f3133d1d730..6953e7ab778 100644
--- a/tools/mapmerge2/fixup.py
+++ b/tools/mapmerge2/fixup.py
@@ -96,7 +96,7 @@ def main(repo):
                     converted[path] = merge_map(head_files[path], dmm.DMM.from_bytes(data))
         if len(working_commit.parents) != 1:
             print("A merge commit was encountered before good versions of these maps were found:")
-            print("\n".join(f"    {x}" for x in head_files.keys() - base_files.keys()))
+            print("\n".join(f"    {x}" for x in head_files.keys() - converted.keys()))
             return 1
         working_commit = working_commit.parents[0]