Add additional challenge for git conflicts

We talk about git helping resolve conflicts when two or more people make changes, but don't really ask students to think about the issue of more than two people making changes. So I added a challenge that would ask the student to try a three-way conflict.
Sorry about that. Force-pushed a version that corrects this.