Fix a cherry-pick mismerge