For now the automated cherry-pick failed if generated files are changed. These conflicts can be resolved automatically — just regenerate files by running make regen-all (or with more specific targets, depending on affected files).