Update auth keys
Add aliases
Add --no-edit to merge