33604: fix change merging for vi mode where a change has just been undone