Added conflicts data for every member
Merge branch 'master' of https://github.com/vickygx/theFrozzies