Macron limbers up for tricky dance with Merkel