fixed book pages if nil
fixed conflict file
fixed conflict
remove