update dotfiles
merge fix