conflicts page now accepts ids in the url and adds conflicts
Merge branch 'master' of https://github.com/vickygx/theFrozzies
conflicts can now be completely updated through the conflicts page