Fixed the merge
Finish static pages