diff --git a/package-lock.json b/package-lock.json
index e53b6be1a..dbba74f66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,7 @@
 {
   "name": "wekan",
-<<<<<<< HEAD
   "version": "v5.58.0",
   "lockfileVersion": 1,
-=======
-  "version": "v5.57.0",
-  "lockfileVersion": 2,
->>>>>>> 2baca605... [Admin panel / People] possibility of adding a team to all selected Users
   "requires": true,
   "packages": {
     "": {