Add a git merge alias
Adjust some `ag` colors
Typo fix