diff --git a/CHANGELOG.md b/CHANGELOG.md
index 320503f..fde0ba1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v2.0.2] - 2019-09-20
+### Fixed
+- Fix template conflicts
+
 ## [v2.0.1] - 2019-09-20
 ### Fixed
 - Fix template import
@@ -216,8 +220,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Conception!
 
-[Unreleased]: https://github.com/taoufik07/responder/compare/v2.0.1..HEAD
-[v2.0.0]: https://github.com/taoufik07/responder/compare/v2.0.0..v2.0.1
+[Unreleased]: https://github.com/taoufik07/responder/compare/v2.0.2..HEAD
+[v2.0.2]: https://github.com/taoufik07/responder/compare/v2.0.1..v2.0.2
+[v2.0.1]: https://github.com/taoufik07/responder/compare/v2.0.0..v2.0.1
 [v2.0.0]: https://github.com/taoufik07/responder/compare/v1.3.2..v2.0.0
 [v1.3.2]: https://github.com/taoufik07/responder/compare/v1.3.1..v1.3.2
 [v1.3.1]: https://github.com/taoufik07/responder/compare/v1.3.0..v1.3.1
diff --git a/responder/__version__.py b/responder/__version__.py
index 159d48b..0309ae2 100644
--- a/responder/__version__.py
+++ b/responder/__version__.py
@@ -1 +1 @@
-__version__ = "2.0.1"
+__version__ = "2.0.2"