Fixed merge conflict overwrite of chapters 10 and 11