small fix
Merge commit
Fix regenerate, and clash