France says Macron, Johnson will work to ‘de-escalate’ fishing row