diff --git a/packages.json b/packages.json
index 4091ccf..fd6d304 100644
--- a/packages.json
+++ b/packages.json
@@ -4360,7 +4360,6 @@
     "web": "https://github.com/baabelfish/mangle"
   },
   {
-<<<<<<< HEAD
     "name": "nimshell",
     "url": "https://github.com/vegansk/nimshell",
     "method": "git",