need show
resolve conflict
resolve conflict
add book picture