Ignore untracked dotfiles during the merge

by using git reset instead of git checkout