Changed Zoom
resolved merge conflict