diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index fc50cb623..5227b5e5c 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -1051,11 +1051,15 @@ def admin_request(client):
                 data=json.dumps(_data),
                 headers=[('Content-Type', 'application/json'), create_authorization_header()]
             )
+<<<<<<< HEAD
 <<<<<<< HEAD
             json_resp = json.loads(resp.get_data(as_text=True))
             assert resp.status_code == _expected_status, json_resp
 =======
             if resp.get_data:
+=======
+            if resp.get_data():
+>>>>>>> Fixed admin_request bug
                 json_resp = json.loads(resp.get_data(as_text=True))
             else:
                 json_resp = None