Adding pages
Fixing merge