diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3a799e..30eae37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 Nothing yet.
 
+## [3.1.2] - 2018-11-23
+### Changed
+ - Added conflict with `oauth2-client:2.4.0` due to [breaking change upstream](https://github.com/thephpleague/oauth2-client/issues/752)
+ 
 ## [3.1.1] - 2018-10-01
 ### Added
  - PHP 7.2 and nightly added to test suite
@@ -35,7 +39,7 @@ Nothing yet.
 
 ## [1.1.0] - 2016-08-28
 ### Added
- - Added getApiClient method on GitlabResourceOwner to get an API connector
+ - Added `getApiClient` method on `GitlabResourceOwner` to get an API connector
 
 ## [1.0.0] - 2016-05-20
 ### Changed
@@ -45,7 +49,8 @@ Nothing yet.
 ### Added
  - Original fork, feature complete
 
-[Unreleased]: https://github.com/omines/oauth2-gitlab/compare/3.1.1...master
+[Unreleased]: https://github.com/omines/oauth2-gitlab/compare/3.1.2...master
+[3.1.2]: https://github.com/omines/oauth2-gitlab/compare/3.1.1...3.1.2
 [3.1.1]: https://github.com/omines/oauth2-gitlab/compare/3.1.0...3.1.1
 [3.1.0]: https://github.com/omines/oauth2-gitlab/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/omines/oauth2-gitlab/compare/2.0.0...3.0.0