updating local .dotfiles
fixing merge conflicts