Worked on chart.
resolved merge conflict.