修复key冲突