Made some new pages.
Resolved conflict