Macron remains prickly against Scholz