Update dotfiles
merge