diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9489006d..d401c47a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.3.6
+
+* Fixed Issue ([#311](https://github.com/epam-cross-platform-lab/swagger-dart-code-generator/issues/311))
+* Fixed some borded cases in Swagger generator
+
 # 2.3.5
 
 * Fixed Issue ([#263](https://github.com/epam-cross-platform-lab/swagger-dart-code-generator/issues/263))
diff --git a/pubspec.yaml b/pubspec.yaml
index 58bd6cde..e8f150bf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: swagger_dart_code_generator
 
-version: 2.3.5
+version: 2.3.6
 
 homepage: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator
 repository: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator