Rollback: fix a typo
Branching: trees
Rollback: consider trees and branches