Namespaces fixed, merge-resources passing its tests.