Backing up conflicting files
Using GitHub mirror for dotfiles
Using mr update over checkout