Walkthrough for using cli merge to resolve conflicts

[josephjclark]

• make sure we explain WHY there's a CLI merge
• walk through a simple merge and forc eupdate
• walkthrough a merge with conflict (two changes on one workflow)

Some of this may already be done, I just want to make sure the story is tight