fix book test
merge confilcts
merge conflicts
merge conflicts