remove cherry-pick error