dotfiles sync: work machine
merge conflict