Allow removing a buffer multiple times through redoEventIndex
Handle insertion of merge events correctly