Merge from hubspot