dotfiles merged