From 447f540b444f992adf2b5ce3ffa1b53a6b9770ec Mon Sep 17 00:00:00 2001
From: mkelvers <mikkelelvers@outlook.com>
Date: Tue, 26 May 2026 22:49:12 +0200
Subject: [PATCH] chore: trim conflicts

---
 CONFLICTS.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONFLICTS.md b/CONFLICTS.md
index 79dae52..3eb5777 100644
--- a/CONFLICTS.md
+++ b/CONFLICTS.md
@@ -30,4 +30,3 @@
 
 8. **Remaining handler consistency**
    - Some modules still have duplicated user extraction patterns and could be unified (e.g. `currentUser()` helper usage beyond playback).
-