fix merge conflict
fix merge conflict

yunstanford/sanic,Tim-Erwin/sanic,jrocketfingers/sanic,r0fls/sanic,channelcat/sanic,ashleysommer/sanic,yunstanford/sanic,channelcat/sanic,lixxu/sanic,yunstanford/sanic,ashleysommer/sanic,channelcat/sanic,ai0/sanic,jrocketfingers/sanic,channelcat/sanic,Tim-Erwin/sanic,ashleysommer/sanic,yunstanford/sanic,lixxu/sanic,lixxu/sanic,lixxu/sanic,r0fls/sanic,ai0/sanic