merge conflict for BarChart