name conflict resolution