name conflict fix