fixed image
resolved merge conflicts