fix merge conflicts

Author: Sheila-nk

tests/conftest.py

@@ -9,6 +9,7 @@
 import netifaces
 import pytest
 # from pytest_jupyterhub.jupyterhub_spawners import hub_app
+# from pytest_jupyterhub.jupyterhub_spawners import hub_app
 from docker import from_env as docker_from_env
 from docker.errors import APIError
 from jupyterhub import version_info as jh_version_info
@@ -22,6 +23,10 @@
 # make Hub connectable from docker by default
 # do this here because the `app` fixture has already loaded configuration
 
+# Load pytest plugins
+pytest_plugins = "jupyterhub-spawners-plugin"
+
+
 # Load pytest plugins
 pytest_plugins = "jupyterhub-spawners-plugin"