merge zsh config, cleanup