Working on drawing pie chart
Fixing merge