diff --git a/gravitee-apim-console-webui/src/management/api/analytics/pathMappings/api-path-mappings-add-dialog/api-path-mappings-add-dialog.component.ts b/gravitee-apim-console-webui/src/management/api/analytics/pathMappings/api-path-mappings-add-dialog/api-path-mappings-add-dialog.component.ts
index 433dfb01b23..8bc203fbb66 100644
--- a/gravitee-apim-console-webui/src/management/api/analytics/pathMappings/api-path-mappings-add-dialog/api-path-mappings-add-dialog.component.ts
+++ b/gravitee-apim-console-webui/src/management/api/analytics/pathMappings/api-path-mappings-add-dialog/api-path-mappings-add-dialog.component.ts
@@ -104,9 +104,15 @@ export class ApiPathMappingsAddDialogComponent implements OnInit {
     }
   }
 
+<<<<<<< HEAD
   private initFormGroup(): UntypedFormGroup {
     return new UntypedFormGroup({
       path: new UntypedFormControl(null, [Validators.required, isUnique(this.api.pathMappings), Validators.pattern('^/[a-zA-Z0-9:/]+')]),
+=======
+  private initFormGroup(): FormGroup {
+    return new FormGroup({
+      path: new FormControl(null, [Validators.required, isUnique(this.api.pathMappings), Validators.pattern('^/[a-zA-Z0-9:/._-]+')]),
+>>>>>>> 87965d6aa5 (fix: allow hyphen in path mapping)
     });
   }
 }