Depending on how each student in the pair resolves the conflict, they could have differing master branches. Here, each master branch would have an additional merge commit on top of the associated upstream master branch. If those merge commits aren't identical, then the Extra Credit exercise would induce another conflict. Just something to think about.