resolve name conflict