diff --git a/app/schemas.py b/app/schemas.py
index cae2135f4..ff4f83a95 100644
--- a/app/schemas.py
+++ b/app/schemas.py
@@ -25,11 +25,7 @@ from notifications_utils.recipients import (
 
 from app import ma
 from app import models
-<<<<<<< HEAD
 from app.models import ServicePermission, INTERNATIONAL_SMS_TYPE, SMS_TYPE, LETTER_TYPE, EMAIL_TYPE
-=======
-from app.models import ServicePermission
->>>>>>> Updated service DAO and API end points
 from app.dao.permissions_dao import permission_dao
 from app.dao.service_permissions_dao import dao_fetch_service_permissions
 from app.utils import get_template_instance
diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py
index 6999593f8..7b5fda823 100644
--- a/tests/app/service/test_rest.py
+++ b/tests/app/service/test_rest.py
@@ -159,7 +159,7 @@ def test_get_service_list_has_default_permissions(client, service_factory):
     assert response.status_code == 200
     json_resp = json.loads(response.get_data(as_text=True))
     assert len(json_resp['data']) == 3
-    assert all([set(json['permissions']) & set([EMAIL_TYPE, SMS_TYPE]) for json in json_resp['data']])
+    assert all([set(json['permissions']) == set([EMAIL_TYPE, SMS_TYPE]) for json in json_resp['data']])
 
 
 def test_get_service_by_id_has_default_service_permissions(client, sample_service):