fix bug pie chart
fix conflict