Resolved conflict with namespaces