update to metaphor layout (path namespacing)
resolving conflict