resolve conflict with dotfiles repo