Added .js needed by heatmap
Resolved conflict