Add support for user having an existing PGP key, instructions for TB
Fix conflict