diff --git a/CHANGELOG.md b/CHANGELOG.md
index 997e79bb..a9e7467b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,5 @@
 # Changelog
 
-## v1.8.6 (2018-02-22)
 
 ### Fix
 
@@ -183,25 +182,6 @@
 * The implementation of SVI-MOGP. [Zhenwen Dai]
 
 
-## v1.8.4 (2017-10-06)
-
-### Other
-
-* Bump version: 1.8.3 → 1.8.4. [mzwiessele]
-
-* Update appveyor.yml. [Max Zwiessele]
-
-* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [mzwiessele]
-
-* Merge branch 'deploy' into devel. [Max Zwiessele]
-
-* Merge pull request #557 from SheffieldML/devel. [Max Zwiessele]
-
-  Paramz 0.8 update
-
-* Merge pull request #544 from SheffieldML/devel. [Zhenwen Dai]
-
-  Release GPy 1.8.x
 
 
 ## v1.8.3 (2017-10-02)
diff --git a/setup.cfg b/setup.cfg
index cff2bdb9..da8c939f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,9 @@
 [bumpversion]
+<<<<<<< HEAD
 current_version = 1.8.6
+=======
+current_version = 1.8.5
+>>>>>>> deploy
 tag = True
 commit = True
 
@@ -12,4 +16,3 @@ upload-dir = doc/build/html
 
 [medatdata]
 description-file = README.rst
-