use correct branch for cherry-pick