Resolve some conflicts before merging.
Resolve some conflicts before merging.

TsudaKageyu/taglib,black78/taglib,taglib/taglib,black78/taglib,taglib/taglib,Distrotech/taglib,taglib/taglib,TsudaKageyu/taglib,TsudaKageyu/taglib,Distrotech/taglib,black78/taglib,Distrotech/taglib