thermal: fix conflict issues