fix: rebase issue + isort

Author: kdmccormick

tests/openedx_content/applets/backup_restore/test_restore.py

@@ -8,18 +8,8 @@
 from django.core.management import call_command
 from django.test import TestCase
 
-<<<<<<< HEAD
 from openedx_content.applets.backup_restore.serializers import ComponentSerializer, ContainerSerializer
-from openedx_content.applets.backup_restore.zipper import LearningPackageUnzipper, generate_staged_lp_key
-
-=======
-from openedx_content.applets.backup_restore.serializers import (
-    ComponentSerializer,
-    ContainerSerializer,
-)
 from openedx_content.applets.backup_restore.zipper import LearningPackageUnzipper, generate_staged_package_ref
-
->>>>>>> d4b641b (feat!: Package and Entity `keys` are now opaque `refs`)
 from openedx_content.applets.collections import api as collections_api
 from openedx_content.applets.components import api as components_api
 from openedx_content.applets.containers import api as containers_api