temp-meter preliminary commit
fixes merge conflict