diff --git a/package-lock.json b/package-lock.json
index ced4aa100..149c3945a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,15 +22,9 @@
         "exceljs": "^4.2.1",
         "fibers": "^5.0.0",
         "gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master",
-<<<<<<< HEAD
         "jszip": "^3.7.1",
         "ldapjs": "^2.3.1",
         "markdown-it": "^12.2.0",
-=======
-        "jszip": "^3.7.0",
-        "ldapjs": "^2.3.0",
-        "markdown-it": "^12.1.0",
->>>>>>> e23ced47ae40e055e23506ea9c836b768a8f68c9
         "markdown-it-emoji": "^2.0.0",
         "meteor-node-stubs": "^1.1.0",
         "mongodb": "^3.6.11",
@@ -1961,15 +1955,9 @@
       }
     },
     "node_modules/jszip": {
-<<<<<<< HEAD
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
       "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
-=======
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
-      "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
->>>>>>> e23ced47ae40e055e23506ea9c836b768a8f68c9
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -8517,15 +8505,9 @@
       }
     },
     "jszip": {
-<<<<<<< HEAD
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
       "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
-=======
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
-      "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
->>>>>>> e23ced47ae40e055e23506ea9c836b768a8f68c9
       "requires": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
diff --git a/package.json b/package.json
index 928995d86..a2c092f42 100644
--- a/package.json
+++ b/package.json
@@ -34,15 +34,9 @@
     "exceljs": "^4.2.1",
     "fibers": "^5.0.0",
     "gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master",
-<<<<<<< HEAD
     "jszip": "^3.7.1",
     "ldapjs": "^2.3.1",
     "markdown-it": "^12.2.0",
-=======
-    "jszip": "^3.7.0",
-    "ldapjs": "^2.3.0",
-    "markdown-it": "^12.1.0",
->>>>>>> e23ced47ae40e055e23506ea9c836b768a8f68c9
     "markdown-it-emoji": "^2.0.0",
     "meteor-node-stubs": "^1.1.0",
     "mongodb": "^3.6.11",