brush up revisions, add conflicts (not yet shown)