fix key name conflict