fix cherry-pick conflict