diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py
index 126e9b948..f2ab7cb7d 100644
--- a/tests/app/service/test_rest.py
+++ b/tests/app/service/test_rest.py
@@ -214,7 +214,11 @@ def test_create_service(client, sample_user):
     assert json_resp['data']['email_from'] == 'created.service'
     assert not json_resp['data']['research_mode']
     assert json_resp['data']['dvla_organisation'] == '001'
+<<<<<<< HEAD
     assert json_resp['data']['sms_sender'] == current_app.config['FROM_NUMBER']
+=======
+    assert json_resp['data']['sms_sender'] == 'GOVUK'
+>>>>>>> set sms_sender to be 'GOVUK' if not otherwise specified
 
     auth_header_fetch = create_authorization_header()