Defence and tariffs top the agenda at Merz and Macron working dinner