chart.js
fix merge