fix

Author: benkiel

setup.cfg

@@ -1,9 +1,5 @@
 [bumpversion]
-<<<<<<< HEAD
 current_version = 0.4.7
-=======
-current_version = 0.4.6
->>>>>>> 7fbe3f8490fb66cfd26b7979aed3ed1e016b7e61
 commit = True
 tag = False
 tag_name = {new_version}