Updated background image
Resolved merge conflict