diff --git a/setup.cfg b/setup.cfg
index da8c939f..e4e29dd7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,9 +1,5 @@
 [bumpversion]
-<<<<<<< HEAD
 current_version = 1.8.6
-=======
-current_version = 1.8.5
->>>>>>> deploy
 tag = True
 commit = True