Added screenshots
Added link to conflicts guide in sidebar
Added screenshot
Added conflicts guide
Merge pull request #17 from kumu/conflicts

Conflict help guide