add books
resolve conflict