lose 'on another branch'. We'll keep both versions in head. Otherwise this is good.