zshrc
merge