From 286248e403452ef0edb6182bc8198d8d89a380d5 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Thu, 23 Jul 2026 23:06:18 +0200
Subject: [PATCH] Widened actor merge avatar conflict ignore scope.

---
 src/actors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actors.js b/src/actors.js
index 4a209ca..cfc66fd 100644
--- a/src/actors.js
+++ b/src/actors.js
@@ -871,7 +871,7 @@ export async function mergeActors(targetActorId, sourceActorIds, comment, reqUse
 			trx('actors_avatars')
 				.update('actor_id', targetActorId)
 				.whereIn('actor_id', sourceActorIds)
-				.onConflict(['profile_id', 'media_id'])
+				.onConflict()
 				.ignore(),
 		]);