They left upset, what happened between Merkel and Macron?