removing some merge confllict cruft
removing some merge confllict cruft

Whatthefoxsays/docs,ksigler7/docs,sendgrid/docs,Whatthefoxsays/docs,sendgrid/docs,ksigler7/docs,Whatthefoxsays/docs,sendgrid/docs,ksigler7/docs