Resolve merge conflicts

src/Bundle/ChillMainBundle/Entity/Gender.php

@@ -21,13 +21,13 @@ use Symfony\Component\Validator\Constraints as Assert;
 #[ORM\Table(name: 'chill_main_gender')]
 class Gender
 {
-    #[Serializer\Groups(['read'])]
+    #[Serializer\Groups(['read', 'docgen:read'])]
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER)]
     private ?int $id = null;
 
-    #[Serializer\Groups(['read'])]
+    #[Serializer\Groups(['read', 'docgen:read'])]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
     private array $label = [];
 
@@ -36,7 +36,7 @@ class Gender
     private bool $active = true;
 
     #[Assert\NotNull(message: 'You must choose a gender translation')]
-    #[Serializer\Groups(['read'])]
+    #[Serializer\Groups(['read', 'docgen:read'])]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, enumType: GenderEnum::class)]
     private GenderEnum $genderTranslation;