rebased amsterdam, package-lock is likely kinda broken, but is not really a problem

package-lock.json

@@ -5645,9 +5645,15 @@
       "dev": true
     },
     "apexcharts": {
+<<<<<<< HEAD
       "version": "3.33.0",
       "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.33.0.tgz",
       "integrity": "sha512-gOc0qZijuomtXTThLbb0sKn+mZJkVQADyK/Zw9vQ0JjKVbMYxzek61xk40hT49i1Sq6/MUqsz0WgUXYpqqf8Mg==",
+=======
+      "version": "3.36.3",
+      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.36.3.tgz",
+      "integrity": "sha512-8/FXEs0ohXMff07Gv28XjhPwEJphIUdq2/wii/pcvi54Tw6z1mjrV8ydN8rlWi/ve8BAPBefJkLmRWv7UOBsLw==",
+>>>>>>> c25a95f6 (just npm install)
       "requires": {
         "svg.draggable.js": "^2.2.2",
         "svg.easing.js": "^2.0.0",
@@ -12869,6 +12875,7 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
+<<<<<<< HEAD
         "rxjs": {
           "version": "6.6.7",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@@ -12878,6 +12885,8 @@
             "tslib": "^1.9.0"
           }
         },
+=======
+>>>>>>> c25a95f6 (just npm install)
         "string-width": {
           "version": "4.2.3",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -15202,18 +15211,17 @@
       "dev": true
     },
     "ng-apexcharts": {
+<<<<<<< HEAD
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/ng-apexcharts/-/ng-apexcharts-1.6.0.tgz",
       "integrity": "sha512-fuAmisWikSH7Uy6SZKKg6v5w9eeWtq8VIj3WHybIjmLfNS26GP66ZGWiso4WKegcQetT+7NZ7vq23CEWmgS+UQ==",
+=======
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/ng-apexcharts/-/ng-apexcharts-1.7.4.tgz",
+      "integrity": "sha512-XpykR8qos14i2ly/QrmGkQIUQfqaZAe2+7tDg5An1akws3VwYg6O643g9LwdTIG3YeWlkKtt4zxYJpEJF3uLUg==",
+>>>>>>> c25a95f6 (just npm install)
       "requires": {
-        "tslib": "^1.10.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
+        "tslib": "^2.0.0"
       }
     },
     "ng2-ckeditor": {