resolving merge conflict

Author: nnicolee

sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java

@@ -161,7 +161,6 @@ public class HttpJsonAddressesStub extends AddressesStub {
                     .setDone(Status.DONE.equals(response.getStatus()))
                     .setResponse(response)
                     .setError(response.getHttpErrorStatusCode(), response.getHttpErrorMessage())
-                    .setErrorParser(new ComputeLroErrorParser())
                     .build();
               })
           .build();
@@ -214,7 +213,6 @@ public class HttpJsonAddressesStub extends AddressesStub {
                     .setDone(Status.DONE.equals(response.getStatus()))
                     .setResponse(response)
                     .setError(response.getHttpErrorStatusCode(), response.getHttpErrorMessage())
-                    .setErrorParser(new ComputeLroErrorParser())
                     .build();
               })
           .build();

sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java

@@ -101,7 +101,6 @@ public class HttpJsonRegionOperationsStub extends RegionOperationsStub {
                         .setDone(Status.DONE.equals(response.getStatus()))
                         .setResponse(response)
                         .setError(response.getHttpErrorStatusCode(), response.getHttpErrorMessage())
-                        .setErrorParser(new ComputeLroErrorParser())
                         .build();
                   })
               .setPollingRequestFactory(