Added highcharts to Angular and t5 template
fix merge problems