Added heatmap
Heatmap again
Resolved conflict