Resolve classes and namespaces conflict