diff --git a/package-lock.json b/package-lock.json
index 09dd1a0..341c5d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -47746,13 +47746,8 @@
       "version": "1.0.0-alpha.24",
       "license": "MIT",
       "dependencies": {
-<<<<<<< HEAD
-        "@inrupt/solid-client-authn-core": "^2.2.6",
-        "@solid/community-server": "8.0.0-alpha.0",
-=======
         "@inrupt/solid-client-authn-core": "3.0.0",
-        "@solid/community-server": "^7.1.3",
->>>>>>> 912c266b949bc827229606e9b70949a428547c44
+        "@solid/community-server": "8.0.0-alpha.0",
         "cross-env": "^7.0.3"
       }
     },