Update dotfiles
Resolve merge conflicts