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,