Accidentally left merge conflict in Lesson 10, Term 1