Fixe merge conflit

package.json

@@ -20,6 +20,8 @@
     "@angular/platform-browser-dynamic": "~9.1.6",
     "@angular/router": "~9.1.6",
     "@capacitor/android": "^2.4.0",
+    "@capacitor/cli": "^2.4.5",
+    "@capacitor/core": "^2.4.5",
     "@capacitor/ios": "^2.4.0",
     "@fullcalendar/angular": "^5.3.0",
     "@fullcalendar/daygrid": "^5.3.0",
@@ -36,8 +38,6 @@
     "@ionic/pwa-elements": "^3.0.1",
     "@ionic/storage": "^2.3.1",
     "@logisticinfotech/ionic4-datepicker": "^1.4.4",
-    "angular-tag-cloud-module": "^5.2.0",
-    "axios": "^0.19.2",
     "cordova-ios": "6.1.0",
     "cordova-plugin-camera": "^5.0.1",
     "cordova-plugin-file": "^6.0.2",
@@ -46,7 +46,9 @@
     "cordova-sqlite-storage": "^5.1.0",
     "date-fns": "^2.15.0",
     "ionic-selectable": "^4.5.0",
+    "ionic2-alpha-scroll": "^2.0.1",
     "ionic2-calendar": "^0.6.6",
+    "jetifier": "^1.6.6",
     "moment": "^2.27.0",
     "ngx-socket-io": "^3.2.0",
     "rxjs": "~6.5.1",
@@ -61,7 +63,7 @@
     "@angular/compiler": "~9.1.6",
     "@angular/compiler-cli": "~9.1.6",
     "@angular/language-service": "~9.1.6",
-    "@ionic/angular-toolkit": "^2.1.1",
+    "@ionic/angular-toolkit": "^3.0.0",
     "@ionic/lab": "3.1.7",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
@@ -103,7 +105,8 @@
       "cordova-plugin-inappbrowser": {},
       "cordova-plugin-camera": {
         "ANDROID_SUPPORT_V4_VERSION": "27.+"
-      }
+      },
+      "cordova-sqlite-storage": {}
     },
     "platforms": [
       "ios",