Merkel’s summit of two halves, and her Ukraine row