updated demo page
Merge pull request #39 from RTakes/conflict-res

updated demo page