merge zsh-custom and dotfiles