Add new alias for better git merge