updated thermostat_merge folder from Juan