From 4c2e516304faa109a14a8827b6d1933a665f54ab Mon Sep 17 00:00:00 2001
From: rafalopespx <lopes1313@gmail.com>
Date: Sat, 26 Oct 2024 15:05:38 -0400
Subject: [PATCH] Fixing conflicts to merge