Finish static pages
Finish static pages
Conflictos resueltos