diff --git a/edx_rest_framework_extensions/auth/jwt/tests/test_authentication.py b/edx_rest_framework_extensions/auth/jwt/tests/test_authentication.py
index e7fa8819..2adaee8a 100644
--- a/edx_rest_framework_extensions/auth/jwt/tests/test_authentication.py
+++ b/edx_rest_framework_extensions/auth/jwt/tests/test_authentication.py
@@ -32,14 +32,11 @@
     generate_jwt_token,
     generate_latest_version_payload,
 )
-<<<<<<< HEAD
 from edx_rest_framework_extensions.config import (
     ENABLE_JWT_AND_LMS_USER_EMAIL_MATCH,
     ENABLE_SET_REQUEST_USER_FOR_JWT_COOKIE,
 )
-=======
 from edx_rest_framework_extensions.config import ENABLE_SET_REQUEST_USER_FOR_JWT_COOKIE
->>>>>>> 7d931d2 (fixup! fix imports)
 from edx_rest_framework_extensions.tests import factories
 
 
diff --git a/edx_rest_framework_extensions/settings.py b/edx_rest_framework_extensions/settings.py
index 3d16890f..a17681cb 100644
--- a/edx_rest_framework_extensions/settings.py
+++ b/edx_rest_framework_extensions/settings.py
@@ -27,6 +27,7 @@
 DEFAULT_SETTINGS = {
     ENABLE_JWT_AND_LMS_USER_EMAIL_MATCH: False,
     ENABLE_SET_REQUEST_USER_FOR_JWT_COOKIE: False,
+    ENABLE_JWT_AND_LMS_USER_EMAIL_MATCH: False,
 
     'JWT_PAYLOAD_MERGEABLE_USER_ATTRIBUTES': (),
     # Map JWT claims to user attributes.