fix heat bar
conflict resolved