(zsh c) git auto merge, rm brewup
Merge branch 'master' of github.com:ekawa/conf