Merge of zsh settings