Hapag-Lloyd and UASC agree a merger