Edge case for earliest undo
Merged conflict
Rearrange commit calls