Enigmail: Simplify import private key (video not yet updated), add step for changing accout key
Fix conflict