Fixed page numbers
Resolved merge conflict