dotfiles update
merge commit