From 8f48a3921329dffa6e42c7e2b686b2a1fd4d27b8 Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <yuliia.naumenko@elastic.com>
Date: Tue, 10 Nov 2020 12:33:37 -0800
Subject: [PATCH] Fixed merge issue

---
 x-pack/plugins/alerts/server/task_runner/task_runner.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner.ts b/x-pack/plugins/alerts/server/task_runner/task_runner.ts
index 1d39cef7a74ac..c19e967e25e81 100644
--- a/x-pack/plugins/alerts/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerts/server/task_runner/task_runner.ts
@@ -231,7 +231,7 @@ export class TaskRunner {
       alertInstances,
       executionHandler,
       originalAlertInstanceIds,
-      currentAlertInstanceIds
+      instancesWithScheduledActions
     );
 
     generateNewAndResolvedInstanceEvents({
@@ -464,8 +464,9 @@ function scheduleActionsForResolvedInstances(
   },
   executionHandler: ReturnType<typeof createExecutionHandler>,
   originalAlertInstanceIds: string[],
-  currentAlertInstanceIds: string[]
+  currentAlertInstances: Dictionary<AlertInstance>
 ) {
+  const currentAlertInstanceIds = Object.keys(currentAlertInstances);
   const resolvedIds = without(originalAlertInstanceIds, ...currentAlertInstanceIds);
   for (const id of resolvedIds) {
     alertInstancesMap[id].updateLastScheduledActions(ResolvedActionGroup.id);