PR-2: The conflict

I made these changes specifically to show you what happens when 2 people try to change the same thing.

- Be sure to merge in PR-1 first.
- Then come here and see what happens when you try to merge this in.
- Follow the instructions in the console to see what happens when you merge in 2 conflicting requests