highchart
removed conflict
some more changes