Resolve alias conflict