From 9f67ddd2e21f64bd1d2435d1aa4dd56fd4134468 Mon Sep 17 00:00:00 2001
From: Rin <dangnhatrin90@gmail.com>
Date: Sun, 3 May 2026 20:30:15 +0700
Subject: [PATCH] fix: resolve merge conflicts and clean up logic across all PR
 files