made two books
resolve merge conflicts