From 35e189ef6e3be8c92f996685481fa16ae233a85b Mon Sep 17 00:00:00 2001
From: mrjo118 <jo.118@hotmail.com>
Date: Fri, 11 Jul 2025 10:59:26 +0100
Subject: [PATCH] Desktop, Mobile: Resolves #12594: Move the conflicts folder
 to the top of the notebook list to improve visibility (#12688)

---
 packages/lib/models/Folder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lib/models/Folder.ts b/packages/lib/models/Folder.ts
index 12cbf2d5d2..e569f81824 100644
--- a/packages/lib/models/Folder.ts
+++ b/packages/lib/models/Folder.ts
@@ -357,7 +357,7 @@ export default class Folder extends BaseItem {
 
 		if (options && options.includeConflictFolder) {
 			const conflictCount = await Note.conflictedCount();
-			if (conflictCount) output.push(this.conflictFolder());
+			if (conflictCount) output.unshift(this.conflictFolder());
 		}
 
 		return output;