Donald Trump and Emmanuel Macron seek to diffuse tensions before WWI anniversary