Updates dotfiles
Resolves merge conflicts