resolve merge conflicts

src/Entity/Public/PublicEvent.php

@@ -43,6 +43,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiFilter(filterClass: OrderFilter::class, properties: ['datetimeStart', 'datetimeEnd'], arguments: ['orderParameterName' => 'order'])]
 #[ApiFilter(filterClass: RangeFilter::class, properties: ['priceMini', 'priceMaxi'])]
 #[ApiFilter(filterClass: ArrayFieldFilter::class, properties: ['categories', 'gender'])]
+#[ApiFilter(filterClass: OrderFilter::class, properties: ['priceMini', 'priceMaxi'], arguments: ['orderParameterName' => 'price_order'])]
 class PublicEvent
 {
     #[ORM\Id]