fix: resolve merge conflict markers in test file

Signed-off-by: Swati Mukund Bagal <sbagal@redhat.com>

Author: SB159

tests/model_serving/maas_billing/maas_subscription/test_api_key_bulk_operations.py

@@ -22,7 +22,7 @@
 class TestAPIKeyBulkOperations:
     """Tests for MaaS API key bulk revoke operations."""
 
-    @pytest.mark.tier2
+    @pytest.mark.tier1
     @pytest.mark.parametrize("ocp_token_for_actor", [{"type": "admin"}], indirect=True)
     def test_bulk_revoke_own_keys(
         self,
@@ -46,14 +46,6 @@ def test_bulk_revoke_own_keys(
             username=username,
             min_revoked_count=3,
         )
-<<<<<<< HEAD
-        assert bulk_resp.status_code == 200, (
-            f"Expected 200 on bulk-revoke for user {username}, got {bulk_resp.status_code}: {bulk_resp.text[:200]}"
-        )
-        revoked_count = bulk_body.get("revokedCount", 0)
-        assert revoked_count >= 3, f"Expected at least 3 revoked keys, got revokedCount={revoked_count}"
-=======
->>>>>>> 8c7033f (fix: address review comments)
         LOGGER.info(f"[bulk-revoke] User {username} bulk revoked {revoked_count} key(s)")
 
         for key_id in three_active_api_key_ids:
@@ -72,7 +64,7 @@ def test_bulk_revoke_own_keys(
             )
         LOGGER.info(f"[bulk-revoke] All {len(three_active_api_key_ids)} key(s) confirmed revoked")
 
-    @pytest.mark.tier2
+    @pytest.mark.tier1
     @pytest.mark.parametrize("ocp_token_for_actor", [{"type": "free"}], indirect=True)
     def test_bulk_revoke_other_user_forbidden(
         self,
@@ -93,7 +85,7 @@ def test_bulk_revoke_other_user_forbidden(
         )
         LOGGER.info("[bulk-revoke] Non-admin correctly received 403 when attempting to bulk revoke another user's keys")
 
-    @pytest.mark.tier2
+    @pytest.mark.tier1
     @pytest.mark.parametrize("ocp_token_for_actor", [{"type": "free"}], indirect=True)
     def test_bulk_revoke_admin_can_revoke_any_user(
         self,
@@ -104,11 +96,7 @@ def test_bulk_revoke_admin_can_revoke_any_user(
         admin_ocp_token: str,
     ) -> None:
         """Verify an admin can bulk revoke any user's active API keys."""
-<<<<<<< HEAD
-        bulk_resp, bulk_body = bulk_revoke_api_keys(
-=======
         revoked_count = assert_bulk_revoke_success(
->>>>>>> 8c7033f (fix: address review comments)
             request_session_http=request_session_http,
             base_url=base_url,
             ocp_user_token=admin_ocp_token,