Back From Holiday, Angela Merkel Shifts Gear on Diesel