Resolved function name conflict