Add update and delete books
fix conflicts