fixing function name conflict