Add conflict resolution example to walkthrough