Fix heatmap legend
Merge