[zsh] use commands I install
[git] reset merge setting