chart refactor
fix git batch issue