Merge temperature sensor branch