- Automatically add conflicts received from subscriptions - Add conflicts book to UI - Show both entries on conflicts details pages - Add special handling for conflicts book in BFNS TODO: Add conflict resolution buttons