buf
update zshrc
merge