diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a4f076b5..267a7e48e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.11] - 2022-08-21
+### Added
+- #1805 - Default flat param object
+### Changed
+- upgrade swagger-ui: 4.14.0
+### Fixed
+- #1801 - Duplicated header values when an endpoint can be called with different headers
+- #1801 - NPE for request bodies with content that has media type MULTIPART_FORM_DATA_VALUE
+- #1793 - Query parameter part of request body in controller with MultiPartFile
+- #1791 - Override-with-generic-response not working from 1.6.8 onwards
+- #1799 - Polymorphism - Support JsonTypeInfo.Id.CLASS
+
 ## [1.6.10] - 2022-08-15
 ### Added
 - #1700 - Support PageableDefault#value()
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseService.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseService.java
index bf231f09f..6b7637e49 100644
--- a/springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseService.java
+++ b/springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseService.java
@@ -29,7 +29,6 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app192/HelloController.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app192/HelloController.java
index 8c89aca6e..81d4b762e 100644
--- a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app192/HelloController.java
+++ b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app192/HelloController.java
@@ -28,6 +28,7 @@
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;