Biden meets with French President Macron after major diplomatic clash