resolved merge conflict
resolved merge conflict

tjtate/sparkpost-api-documentation,SparkPost/sparkpost-api-documentation,SparkPost/sparkpost-api-documentation,tjtate/sparkpost-api-documentation,SparkPost/sparkpost-api-documentation,tjtate/sparkpost-api-documentation