sanurb/.dotfiles/resolving-merge-conflictsskill versions