Book update

Corrected merge issues