merge conflict fix
merge conflict fix

LoganWright/vapor,mpclarkson/vapor,kdawgwilk/vapor,vapor/vapor,vapor/vapor,vapor/vapor,qutheory/vapor,qutheory/vapor,kdawgwilk/vapor,vapor/vapor,qutheory/vapor,kdawgwilk/vapor,LoganWright/vapor