fixed the name conflict error