rename file
modify format
add books
resolve conflict