fix merge issues

src/app/core/services/private-catalogs.service.ts

@@ -123,7 +123,7 @@ export class PrivateCatalogsService {
       );
   }
 
-  uploadFileToUrl(
+  uploadExistingModelLicenseProfile(
     loginUserID: string,
     solutionId: string,
     revisionId: string,
@@ -141,8 +141,6 @@ export class PrivateCatalogsService {
       revisionId +
       '/' +
       versionId;
-    const uploadUrl =
-      'https://dev02.ki-lab.nrw/api/license/upload/9b36ce33-ec9c-48e3-964f-5fd7e75ede6c/620ec698-4027-414a-8b9f-8d6503cbf35b/86e0f4fd-694a-4ba2-ba9f-bb3db1dc850f/1.0.0';
 
     const formData = new FormData();
     formData.append('file', file);
@@ -155,6 +153,24 @@ export class PrivateCatalogsService {
     return this.http.request(req);
   }
 
+  uploadNewModelLicenseProfile(userId: string, file: File) {
+    const url =
+      apiConfig.apiBackendURL +
+      '/api/model/upload/' +
+      userId +
+      '/?licUploadFlag=' +
+      true;
+    const formData = new FormData();
+    formData.append('file', file);
+
+    const req = new HttpRequest('POST', url, formData, {
+      reportProgress: true,
+      responseType: 'json',
+    });
+
+    return this.http.request(req);
+  }
+
   createUpdateLicenseProfile(
     loginUserID: string,
     solutionId: string,