Resolve class name conflict