merge-tree: lose unused "resolve_directories"