fix(FN-158): remove residual conflict marker

Fusion-Task-Id: FN-158

packages/engine/src/__tests__/workspace-add-repo-midflight.test.ts

@@ -31,7 +31,6 @@ function toolFor(currentTask: any, repos: string[], resolveWorkspaceRepos?: () =
     task: currentTask,
     store: {
       getTask: vi.fn(async () => currentTask),
-<<<<<<< HEAD
       /*
       FNXC:RepositoryScope 2026-08-21-05:15:
       Acquisition fixtures expose the post-acquire scope mutation seam because successful late admission now persists repository intent.

packages/engine/src/__tests__/workspace-root-worktree-routing.test.ts

@@ -225,7 +225,7 @@ describeIfGit("FN-034 workspace root worktree routing", { timeout: 60_000 }, ()
 
     expect(result.taskWorktreeDir).toBe(join(fixture.rootDir, ".fusion", "worktrees", "fn-106"));
     expect(result.taskWorktreeDir).not.toBe(result.task.workspaceWorktrees?.["repo-b"]?.worktreePath);
-    expect(result.task.worktree).toBeUndefined();
+    expect(result.task.worktree).toBeNull();
   });
 
   it("rejects a stale review target instead of falling back to another repository", async () => {