debugging heatmap
fixed merge conflict in heatmap