Macron and Merz agree to deepen defence ties and push for tougher stance on China