Merge pull request #5777 from nextcloud/backport/5766/stable-3.9

[stable-3.9] Bugfix. Conflict resolution button not clickable.

src/gui/tray/ActivityItemContent.qml

@@ -270,7 +270,7 @@ RowLayout {
 
                 maxActionButtons: activityModel.maxActionButtons
 
-                onTriggerAction: activityModel.slotTriggerAction(model.activityIndex, actionIndex)
+                onTriggerAction: activityModel.slotTriggerAction(activityData.activityIndex, actionIndex)
 
                 onShowReplyField: isTalkReplyOptionVisible = true
             }