mergetool: don't skip modify/remove conflicts