fix bad merge
Merge branch 'master' of https://github.com/TonightWe/TW.InternetMediaTypes.git