Merge encryption key and keychain item repositories