updating dotfiles
conflicts