Trump makes nice, but ‘war on California’ persists