bookscontroller fixed
conflict fixed