conflicts page
Merge pull request #43 from evildmp/conflictspage

conflicts page