Fix merge errors

ui-ngx/patches/@iplab+ngx-color-picker+18.0.1.patch

@@ -1,26 +0,0 @@
-diff --git a/node_modules/@iplab/ngx-color-picker/esm2022/lib/helpers/color.class.mjs b/node_modules/@iplab/ngx-color-picker/esm2022/lib/helpers/color.class.mjs
-index 6c7f8b1..f390b3b 100644
---- a/node_modules/@iplab/ngx-color-picker/esm2022/lib/helpers/color.class.mjs
-+++ b/node_modules/@iplab/ngx-color-picker/esm2022/lib/helpers/color.class.mjs
-@@ -173,7 +173,7 @@ export class Color {
-         const s = (color.saturation / 100) * (l <= 1 ? l : 2 - l);
-         const value = (l + s) / 2;
-         const saturation = (2 * s) / (l + s) || 0;
--        return new Hsva(hue, saturation, value, color.alpha);
-+        return new Hsva(hue, saturation * 100, value * 100, color.alpha);
-     }
-     rgbaToHsva(color) {
-         const red = color.red / 255;
-diff --git a/node_modules/@iplab/ngx-color-picker/fesm2022/iplab-ngx-color-picker.mjs b/node_modules/@iplab/ngx-color-picker/fesm2022/iplab-ngx-color-picker.mjs
-index a3b270c..9a9b592 100644
---- a/node_modules/@iplab/ngx-color-picker/fesm2022/iplab-ngx-color-picker.mjs
-+++ b/node_modules/@iplab/ngx-color-picker/fesm2022/iplab-ngx-color-picker.mjs
-@@ -505,7 +505,7 @@ class Color {
-         const s = (color.saturation / 100) * (l <= 1 ? l : 2 - l);
-         const value = (l + s) / 2;
-         const saturation = (2 * s) / (l + s) || 0;
--        return new Hsva(hue, saturation, value, color.alpha);
-+        return new Hsva(hue, saturation * 100, value * 100, color.alpha);
-     }
-     rgbaToHsva(color) {
-         const red = color.red / 255;