Add colisions
Merge branch 'master' of https://github.com/black-duck/Prisma