resolved name conflict