Namespace conflict resolved