Fix merge behavior

only revert dotfiles instead of deleting them