updated dotfiles
merging dotfiles