testing using ;max sortpatcherdictonsave 1 in order to clean up diffs . . . think it works!
resolving merge conflict