From ab2e4cf6ea01b876f7552cceeac461c36dc8dffa Mon Sep 17 00:00:00 2001
From: MartianGreed <valentin@pupucecorp.com>
Date: Thu, 16 Apr 2026 08:05:10 +0200
Subject: [PATCH] resolve main merge conflicts