fixed images, first 3 pages completed
resolved merge conflict