Bug de merge
Regenerate files