resolved class name conflict