thermal: update

Conflicts:

	Makefile