Resolve merge conflicts from cherry-pick