From e4e732a77b2c09491e64121591b5f9b99cc4c6ac Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Mon, 30 Mar 2026 16:19:10 +0900
Subject: [PATCH] fix(tasks): remove sqlite merge marker

---
 src/tasks/task-registry.store.sqlite.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/tasks/task-registry.store.sqlite.ts b/src/tasks/task-registry.store.sqlite.ts
index 0e507bc7d6d..6ab863c9ce3 100644
--- a/src/tasks/task-registry.store.sqlite.ts
+++ b/src/tasks/task-registry.store.sqlite.ts
@@ -186,7 +186,6 @@ function createStatements(db: DatabaseSync): TaskRegistryStatements {
       FROM task_runs
       ORDER BY created_at ASC, task_id ASC
     `),
-<<<<<<< HEAD
     selectAllDeliveryStates: db.prepare(`
       SELECT
         task_id,