fixed conflicts in Book