diff --git a/packages.json b/packages.json
index 953b53e..cab756f 100644
--- a/packages.json
+++ b/packages.json
@@ -3589,7 +3589,6 @@
     "web": "https://github.com/theduke/nim-nimlog"
   },
   {
-<<<<<<< HEAD
     "name": "values",
     "url": "https://github.com/theduke/nim-values",
     "method": "git",
@@ -3601,7 +3600,8 @@
     "description": "Library for working with arbitrary values + a map data structure.",
     "license": "MIT",
     "web": "https://github.com/theduke/nim-values"
-=======
+  },
+  {
     "name": "geohash",
     "url": "https://github.com/twist-vector/nim-geohash.git",
     "method": "git",
@@ -3626,6 +3626,5 @@
     "description": "Nim implementation of the Bittorrent ascii serialization protocol",
     "license": "Apache License 2.0",
     "web": "https://github.com/twist-vector/nim-bped"
->>>>>>> a773e798c2dafcd5b6b3338ee136c53a159f857c
   }
 ]