remove ssh-copy-id
Resolving a merge-conflict in the 'ssh-keygen' cheatsheet.