Macron and Johnson are working on de-escalation