Part 4 of Lab 2 - Let's generate some merge conflicts!