I added new pages and fixed some
Fixed another merge conflict