keychain key scan correction
Merge resolution...