fix book test
merge confilcts