Resolve naming conflict