diff --git a/package.json b/package.json
index e6d22481..c080b07e 100644
--- a/package.json
+++ b/package.json
@@ -39,14 +39,7 @@
 		"erlpack": "github:discordapp/erlpack",
 		"mathjs": "^3.16.4",
 		"node-opus": "^0.2.7",
-<<<<<<< HEAD
 		"snekfetch": "^3.4.2",
-=======
-		"pg": "^6.4.2",
-		"pg-hstore": "^2.3.2",
-		"sequelize": "^4.13.1",
-		"snekfetch": "^3.4.2",
->>>>>>> 08785fdc8f0c24988f5a6c6ca60dd941f1b229fc
 		"uws": "^8.14.1",
 		"xml-js": "^1.4.2"
 	},