Temperature and Income: Reconciling New Cross-Sectional and Panel Estimates