encrypted mem/plist variant
resolve conflicts after merge
resolve missing entry from merge
fixed header typo
fix nil check missing
added note for the keychain broken issue