Add the grep alias to the zshrc config
Merge with Master and solve merge conflict