compressed bg photo
resolved merge conflict
changed design