4.5 Exercise 5 - another git conflict

From git’s repo, checkout revision cf054f817a and merge revision caf388caa1. ³.

I will let you work on this conflict on your own. There are 5 CBs in 3 files. When you are done, compare with 9b6606f43d and you should get no meaningful differences.