Updates to conflict handling tutorial
More doc fixes, image renames