因為oh-my-zsh會自動更新版本，所以要ignore dirty
Merge remote-tracking branch 'upstream/master'