Fixed conflict in pull request https://github.com/badges/shields/pull/214

 fixed the conflict in https://github.com/badges/shields/pull/214