diff --git a/SAS/TMSS/test/tmss_test_environment_unittest_setup.py b/SAS/TMSS/test/tmss_test_environment_unittest_setup.py
index bec8ad5b7ea6bd9b32a86a1365d522189caa4e5f..5fe5bbe88f480899bc1a22379b674165f394e54a 100644
--- a/SAS/TMSS/test/tmss_test_environment_unittest_setup.py
+++ b/SAS/TMSS/test/tmss_test_environment_unittest_setup.py
@@ -71,13 +71,9 @@ def _call_API_and_assert_expected_response(test_instance, url, call, data, expec
 
     content = response.content.decode('utf-8')
 
-<<<<<<< Updated upstream
-    if response.status_code in range(200, 300):
-=======
     from django.db import models
 
     if response.status_code in range(200, 300) and expected_content is not None:
->>>>>>> Stashed changes
         r_dict = json.loads(content)
         for key, value in expected_content.items():
             if key not in r_dict.keys():