fixing piechart
resolving conflicts