started adding backend to conflicts page
Merge branch 'master' of https://github.com/vickygx/theFrozzies