Revert "adding new pages conflict"

This reverts commit 4f159888ae8ee2d6dc0e43ff59ad79d6c31efc99.
Revert "adding new pages"

This reverts commit 8e14d7c2da1637cb3674680091bc14eaa825b90d.