diff --git a/DESCRIPTION b/DESCRIPTION
index 549b33e..2cc4ad8 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,9 +1,5 @@
 Package: biomaRt
-<<<<<<< HEAD
-Version: 2.59.0
-=======
 Version: 2.59.1
->>>>>>> httr2
 Title: Interface to BioMart databases (i.e. Ensembl)
 License: Artistic-2.0
 Description: In recent years a wealth of biological data has become available