resolve-undo: record resolved conflicts in a new index extension section