From 5900ae93338c42e136e376b7ace81308a5389771 Mon Sep 17 00:00:00 2001
From: Rin <dangnhatrin90@gmail.com>
Date: Sun, 3 May 2026 20:43:56 +0700
Subject: [PATCH] fix: final merge resolution and clean up logic across all PR
 files after syncing main