Fix erroneous merge conflict resolution from v2.5.11

netbox/extras/api/views.py

@@ -149,7 +149,7 @@ class TopologyMapViewSet(ModelViewSet):
 
 class TagViewSet(ModelViewSet):
     queryset = Tag.objects.annotate(
-        tagged_items=Count('taggit_taggeditem_items', distinct=True)
+        tagged_items=Count('extras_taggeditem_items', distinct=True)
     )
     serializer_class = serializers.TagSerializer
     filterset_class = filters.TagFilter

netbox/extras/views.py

@@ -29,7 +29,7 @@ from .tables import ConfigContextTable, ObjectChangeTable, TagTable, TaggedItemT
 
 class TagListView(ObjectListView):
     queryset = Tag.objects.annotate(
-        items=Count('taggit_taggeditem_items', distinct=True)
+        items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
     )