Added extra pages
Resolved conflict