fix merge conflict

Author: bchampp

tests/e2e/execution_int_test.py

@@ -391,15 +391,3 @@ def mock_checkpoint(
         assert checkpoint.action is OperationAction.START
         assert checkpoint.operation_id == "1"
         assert checkpoint.wait_options.wait_seconds == 1
-
-
-def test_lambda_client_initialization():
-    """Test initialization of real Lambda client with specified endpoint and region."""
-    endpoint = "https://durable.durable-functions.devo.us-west-2.lambda.aws.a2z.com"
-    region = "us-west-2"
-
-    client = LambdaClient.initialize_from_endpoint_and_region(endpoint, region)
-
-    assert client is not None
-    assert client.client is not None
-        assert checkpoint.wait_options.seconds == 1