resolved conflicting names