edited name conflict