added a diff color
resolved merge conflicts