Removed some conflict content
Merge branch 'develop' of https://github.com/sendgrid/docs into develop