Fix typo in Section 4.12 (the class template in the example is called 'multiply', not 'times').
Fix merge conflicts.