resolve java okhttp issue due to merge conflicts

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java

@@ -72,6 +72,8 @@ public class ApiClient {
      */
     public ApiClient() {
         httpClient = new OkHttpClient();
+
+
         verifyingSsl = true;
         json = new JSON();
 
@@ -820,6 +822,13 @@ public class ApiClient {
             if (returnType == null || response.code() == 204) {
                 // returning null if the returnType is not defined,
                 // or the status code is 204 (No Content)
+                if (response.body() != null) {
+                    try {
+                        response.body().close();
+                    } catch (IOException e) {
+                        throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+                    }
+                }
                 return null;
             } else {
                 return deserialize(response, returnType);