resolve merge conflicts

src/Entity/Public/PublicEvent.php

@@ -471,14 +471,12 @@ class PublicEvent
         return $this;
     }
 
-
-    public function getStructureName()
+    public function getStructureName(): string
     {
         return $this->structureName;
     }
 
-
-    public function setStructureName($structureName)
+    public function setStructureName(string $structureName): PublicEvent
     {
         $this->structureName = $structureName;
 

src/Enum/Access/FunctionEnum.php

@@ -57,6 +57,8 @@ enum FunctionEnum: string
     case BENEFACTOR_MEMBER = 'BENEFACTOR_MEMBER';
     case HOUR_MEMBER = 'HOUR_MEMBER';
     case OTHER = 'OTHER';
+    case ARTISTIC_DIRECTOR = 'ARTISTIC_DIRECTOR';
+    case ARTISTIC_DIRECTOR_ASSISTANT = 'ARTISTIC_DIRECTOR_ASSISTANT';
 
     /**
      * Office missions.