Changed color to purple
Resolved merge conflicts