Book Supplier View
Merge Conflict