update dotfiles
fix conflict