Tagged conflict-management