diff --git a/package.json b/package.json
index 322f8ad..bf1c286 100644
--- a/package.json
+++ b/package.json
@@ -22,11 +22,7 @@
   },
   "dependencies": {
     "axios": "^0.19.2",
-<<<<<<< HEAD
-    "eris": "abalabahaha/eris#dev",
-=======
     "eris": "bsian03/eris#bsian",
->>>>>>> dev
     "moment": "^2.24.0",
     "mongoose": "^5.9.9",
     "signale": "^1.4.0",