Add illustration of VCS conflicts

I think this will help students follow the conflicts section of the lesson.