all namespaces explicit
fixed merge conflict