Resolved name conflict