merge new zshrc