Agregando scaffolds
Merging files