Manually merging sendgrid commits