* Fix ubuntu ag alias clashing with the silver searcher * Add aliases for git apply and git merge --abort